Hive tests with Byzantine

218 files changed, 49155 insertions, 13051 deletions

diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0.json
index 6b4603c2a..92118fb51 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_0input_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_0input_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/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc273",
-                    "hash" : "0xe2085c9cec999f34a65c567ab1c80247c3ebee15b7c879ac2918ca4d7f614375",
-                    "mixHash" : "0x99234a8c3870c0137fd598586acf2f8fe60bf0086c3eabf0fa07bdf07781a182",
-                    "nonce" : "0xa981a9e1d12c606c",
+                    "gasUsed" : "0xc29b",
+                    "hash" : "0x7a69053c64d587f77aff172a59ee0c68672fbf4f631bc4f4c9fce73024acd434",
+                    "mixHash" : "0x2d7259f0add7bbcb7b46a5d6ea68ee1d16388c291e8e09d19bc3c204d34aa5ce",
+                    "nonce" : "0x10ac25e92f00d4a3",
                     "number" : "0x01",
                     "parentHash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
-                    "receiptTrie" : "0x0f5ed9c935da3b3cbf4c482e6006462fe7b850a45fa81f334511cc916c7447f7",
-                    "stateRoot" : "0x172bf2725bde2d7e3b3bad1763eed793324c2a5d7a12fd891eda15d54e7df8c8",
+                    "receiptTrie" : "0xe73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88",
+                    "stateRoot" : "0x890b42ca847f117f0023381a9ce4c7110806968ef94c94a03a63b2efcbc9033a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0172bf2725bde2d7e3b3bad1763eed793324c2a5d7a12fd891eda15d54e7df8c8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a00f5ed9c935da3b3cbf4c482e6006462fe7b850a45fa81f334511cc916c7447f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2738203e880a099234a8c3870c0137fd598586acf2f8fe60bf0086c3eabf0fa07bdf07781a18288a981a9e1d12c606cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890b42ca847f117f0023381a9ce4c7110806968ef94c94a03a63b2efcbc9033aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a02d7259f0add7bbcb7b46a5d6ea68ee1d16388c291e8e09d19bc3c204d34aa5ce8810ac25e92f00d4a3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2085c9cec999f34a65c567ab1c80247c3ebee15b7c879ac2918ca4d7f614375",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7a69053c64d587f77aff172a59ee0c68672fbf4f631bc4f4c9fce73024acd434",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c273",
+                "balance" : "0x4563918244f4c29b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b6ed",
+                "balance" : "0x0de0b6b3a761b6c5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_0input_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_0input_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/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc29b",
-                    "hash" : "0x49c8434b4bdbe8b01fe98dde4f73f3cfa5b04e62959b38e01bb716c8bb75830a",
-                    "mixHash" : "0x289022ec46919e6bdd34eabef42de5984684f51d6586068bcb87d26a5f68c909",
-                    "nonce" : "0x5a05d8dbcd219c59",
+                    "hash" : "0xedb7e3d5b4b69a4665a58fe6e181f5ce8661a5791297227d111c9a42f881f54f",
+                    "mixHash" : "0x92b04bc8e9d89c7b3bcc62e719738108af9aab6b7bb62bb0b692e726307eb1b7",
+                    "nonce" : "0xf2c88f8ccb8e0193",
                     "number" : "0x01",
                     "parentHash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
-                    "receiptTrie" : "0x8efdfc4d9eadd1c0382cb8a9cc93115c0e9351b869334248e491d84c7d57e0a9",
-                    "stateRoot" : "0x651ad96c69d1f6ec086cc1b89c98217deca20f0ae62a0abc450e3c5abd4d9cab",
+                    "receiptTrie" : "0xe73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88",
+                    "stateRoot" : "0x890b42ca847f117f0023381a9ce4c7110806968ef94c94a03a63b2efcbc9033a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0651ad96c69d1f6ec086cc1b89c98217deca20f0ae62a0abc450e3c5abd4d9caba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08efdfc4d9eadd1c0382cb8a9cc93115c0e9351b869334248e491d84c7d57e0a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a0289022ec46919e6bdd34eabef42de5984684f51d6586068bcb87d26a5f68c909885a05d8dbcd219c59f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890b42ca847f117f0023381a9ce4c7110806968ef94c94a03a63b2efcbc9033aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a092b04bc8e9d89c7b3bcc62e719738108af9aab6b7bb62bb0b692e726307eb1b788f2c88f8ccb8e0193f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49c8434b4bdbe8b01fe98dde4f73f3cfa5b04e62959b38e01bb716c8bb75830a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xedb7e3d5b4b69a4665a58fe6e181f5ce8661a5791297227d111c9a42f881f54f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_0input_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_0input_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/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xbfdf",
-                    "hash" : "0x89b80328fd664e48faee95aa86af9c99a1861d6e3bfa3c14f454bc4c8bf9b419",
-                    "mixHash" : "0x0a53049ef80790902970b59978af4ad95af4f4a7b2f557677259d6679090907e",
-                    "nonce" : "0x8891ca640231faca",
+                    "gasUsed" : "0xc273",
+                    "hash" : "0xf629926f1f9bb3c2406e752805e2ee919fd842b6871a499faf40f80c4bce0a2d",
+                    "mixHash" : "0x2868677ee2fe4d4a0d7156ad432b821dd5d8fbc01533c88acb3987a3a4250e65",
+                    "nonce" : "0x7c47182347074891",
                     "number" : "0x01",
                     "parentHash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
-                    "receiptTrie" : "0xdeee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155",
-                    "stateRoot" : "0x948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6",
+                    "receiptTrie" : "0x0f5ed9c935da3b3cbf4c482e6006462fe7b850a45fa81f334511cc916c7447f7",
+                    "stateRoot" : "0x172bf2725bde2d7e3b3bad1763eed793324c2a5d7a12fd891eda15d54e7df8c8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0deee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082bfdf8203e880a00a53049ef80790902970b59978af4ad95af4f4a7b2f557677259d6679090907e888891ca640231facaf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0172bf2725bde2d7e3b3bad1763eed793324c2a5d7a12fd891eda15d54e7df8c8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a00f5ed9c935da3b3cbf4c482e6006462fe7b850a45fa81f334511cc916c7447f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2738203e880a02868677ee2fe4d4a0d7156ad432b821dd5d8fbc01533c88acb3987a3a4250e65887c47182347074891f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89b80328fd664e48faee95aa86af9c99a1861d6e3bfa3c14f454bc4c8bf9b419",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf629926f1f9bb3c2406e752805e2ee919fd842b6871a499faf40f80c4bce0a2d",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4bfdf",
+                "balance" : "0x4563918244f4c273",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b981",
+                "balance" : "0x0de0b6b3a761b6ed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_0input_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_0input_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/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xbfdf",
-                    "hash" : "0x1796bbacd8e4ffd62f0fe2ac0ae2787bf3eaaf9ce54a0a396e8710bb23c08c54",
-                    "mixHash" : "0x9ff669caeded3707d6fdc82f39d09fe211d81f605e7ad9d840b50e3fff508674",
-                    "nonce" : "0x46a383adb4fd5388",
+                    "gasUsed" : "0xc29b",
+                    "hash" : "0xaf0041e81828f15cddea5bf3abf45a5bc423a55ae26ba6ca07ddac1406b6a5bc",
+                    "mixHash" : "0x74bbe4c9343f5a53dac73959e23ffc83f1ed78b2187ae29cc38ffd47ab4fe890",
+                    "nonce" : "0xc9f1a6fcb4ea91cb",
                     "number" : "0x01",
                     "parentHash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
-                    "receiptTrie" : "0xdeee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155",
-                    "stateRoot" : "0x948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6",
+                    "receiptTrie" : "0x8efdfc4d9eadd1c0382cb8a9cc93115c0e9351b869334248e491d84c7d57e0a9",
+                    "stateRoot" : "0x651ad96c69d1f6ec086cc1b89c98217deca20f0ae62a0abc450e3c5abd4d9cab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0deee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082bfdf8203e880a09ff669caeded3707d6fdc82f39d09fe211d81f605e7ad9d840b50e3fff5086748846a383adb4fd5388f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0651ad96c69d1f6ec086cc1b89c98217deca20f0ae62a0abc450e3c5abd4d9caba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08efdfc4d9eadd1c0382cb8a9cc93115c0e9351b869334248e491d84c7d57e0a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a074bbe4c9343f5a53dac73959e23ffc83f1ed78b2187ae29cc38ffd47ab4fe89088c9f1a6fcb4ea91cbf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1796bbacd8e4ffd62f0fe2ac0ae2787bf3eaaf9ce54a0a396e8710bb23c08c54",
-        "network" : "Homestead",
+        "lastblockhash" : "0xaf0041e81828f15cddea5bf3abf45a5bc423a55ae26ba6ca07ddac1406b6a5bc",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4bfdf",
+                "balance" : "0x4563918244f4c29b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b981",
+                "balance" : "0x0de0b6b3a761b6c5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_0input_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_0input_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/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc29b",
-                    "hash" : "0x1f1e28373555b76354be69d190e65f01c85a47be00227d50c894d4dae583afa6",
-                    "mixHash" : "0xa519cbbc026bb763c26bb6f0ebf5f27aac47122c602ce01db22519f16c6548ea",
-                    "nonce" : "0x991ecc8cb56c9265",
+                    "gasUsed" : "0xbfdf",
+                    "hash" : "0x8292863cad1fc11ddbcac2dc5119fc0e21424995250819608067a6b198248d5c",
+                    "mixHash" : "0x4e7f693061c8e99c5a1f7b802ee63e36ced1789fbb84c2393d5b6af52396c31f",
+                    "nonce" : "0x8f98c539e91e311b",
                     "number" : "0x01",
                     "parentHash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
-                    "receiptTrie" : "0xe73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88",
-                    "stateRoot" : "0x890b42ca847f117f0023381a9ce4c7110806968ef94c94a03a63b2efcbc9033a",
+                    "receiptTrie" : "0xdeee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155",
+                    "stateRoot" : "0x948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890b42ca847f117f0023381a9ce4c7110806968ef94c94a03a63b2efcbc9033aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a0a519cbbc026bb763c26bb6f0ebf5f27aac47122c602ce01db22519f16c6548ea88991ecc8cb56c9265f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0deee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082bfdf8203e880a04e7f693061c8e99c5a1f7b802ee63e36ced1789fbb84c2393d5b6af52396c31f888f98c539e91e311bf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f1e28373555b76354be69d190e65f01c85a47be00227d50c894d4dae583afa6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8292863cad1fc11ddbcac2dc5119fc0e21424995250819608067a6b198248d5c",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bfdf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761b981",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_0input_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xbfdf",
+                    "hash" : "0xdc0fd376851a4cd8a2f2d913af44f60141afa813d826f404b1ebd6bd5447b375",
+                    "mixHash" : "0xedfef2dcbaef934c22d762a267277cb2e706927948f32e1dc9dee070f9b7013b",
+                    "nonce" : "0xb8ecb735686d4c87",
+                    "number" : "0x01",
+                    "parentHash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
+                    "receiptTrie" : "0xdeee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155",
+                    "stateRoot" : "0x948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a058bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948d149181ed99dc4dad334f71b2ad391dff6ef27874d607b52ec351b49657d6a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0deee534c83fa9c07575c90e361e878f3ae23fa45f039c2e92b5106e0ec758155b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082bfdf8203e880a0edfef2dcbaef934c22d762a267277cb2e706927948f32e1dc9dee070f9b7013b88b8ecb735686d4c87f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x58bf2439919f0d8e77ecb82f723256738b6997b0e9e87b9eee8fd14e92a268c8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06958709023a675f7b38a248013f610c656149eb6fd775b59d6e487e145be4435a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc0fd376851a4cd8a2f2d913af44f60141afa813d826f404b1ebd6bd5447b375",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c29b",
+                "balance" : "0x4563918244f4bfdf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b6c5",
+                "balance" : "0x0de0b6b3a761b981",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0.json
index f6865147a..856de705e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_Gas2999_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_Gas2999_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/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x9c59",
-                    "hash" : "0x4a1fa085bfc5c7ef5cff1001d3bbddc4701b683eeccbeb400646e652b9c5ad4b",
-                    "mixHash" : "0xa0ff67d3cae230c28301c27f8035e05b74ce01fd9e32226c6e7e05b93ad156d4",
-                    "nonce" : "0x0e095daa2ef3d4a0",
+                    "gasUsed" : "0x9c81",
+                    "hash" : "0xad7cc3adabffbbaf3e070ffc834dc91d8297474ffa1ffdc8ccd2537eaf824bce",
+                    "mixHash" : "0xcad5f2fb8656d0fbf93bc17a6d3953c8acb595742995d05fc659f54b0889b264",
+                    "nonce" : "0x6f6fad2554863cd4",
                     "number" : "0x01",
                     "parentHash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
-                    "receiptTrie" : "0x2f9fe06645a5b2c4135bc8066c42a8782591c50ec4612eb94b36c51ca8369188",
-                    "stateRoot" : "0x8fd2e83540d3688c9ddefc21549b497c3c71d19ff90ab84b0fedc94e7c09028b",
+                    "receiptTrie" : "0x337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adf",
+                    "stateRoot" : "0x87e5c4b162efd5f281aa3048542b200e8e0a3708493788da7a27c52b4d658936",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fd2e83540d3688c9ddefc21549b497c3c71d19ff90ab84b0fedc94e7c09028ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02f9fe06645a5b2c4135bc8066c42a8782591c50ec4612eb94b36c51ca8369188b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c598203e880a0a0ff67d3cae230c28301c27f8035e05b74ce01fd9e32226c6e7e05b93ad156d4880e095daa2ef3d4a0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e5c4b162efd5f281aa3048542b200e8e0a3708493788da7a27c52b4d658936a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0cad5f2fb8656d0fbf93bc17a6d3953c8acb595742995d05fc659f54b0889b264886f6fad2554863cd4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a1fa085bfc5c7ef5cff1001d3bbddc4701b683eeccbeb400646e652b9c5ad4b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xad7cc3adabffbbaf3e070ffc834dc91d8297474ffa1ffdc8ccd2537eaf824bce",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49c59",
+                "balance" : "0x4563918244f49c81",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761dd07",
+                "balance" : "0x0de0b6b3a761dcdf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_Gas2999_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_Gas2999_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/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x9c81",
-                    "hash" : "0x9149095011445e4f788f42641335dd3caf2a26308769771c15906fbefa8a4f37",
-                    "mixHash" : "0x30ad125a90470bda9ec7008fd302a6f1a18bd413862acdef7717fc526445aba9",
-                    "nonce" : "0xe517d8272d63b3ef",
+                    "hash" : "0x93a80e1ae6ae519afeed65e7d94eedcfd1a9b528e295567d8a1e98642269b0ba",
+                    "mixHash" : "0xe4aea85964de3b48b58046801c3c4418d76775c24fcc9fb90c0ee760e97b3a1a",
+                    "nonce" : "0xb0540976aa093552",
                     "number" : "0x01",
                     "parentHash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
-                    "receiptTrie" : "0x32b1f154a5ed8b929f3d5eaf04e6882a968453709deaf7415668f988958d1a12",
-                    "stateRoot" : "0xd74c3839be313882bd60d3e3af128b8b5f897ae4d46e04b3b9901a97d1ba72a4",
+                    "receiptTrie" : "0x337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adf",
+                    "stateRoot" : "0x87e5c4b162efd5f281aa3048542b200e8e0a3708493788da7a27c52b4d658936",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d74c3839be313882bd60d3e3af128b8b5f897ae4d46e04b3b9901a97d1ba72a4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba032b1f154a5ed8b929f3d5eaf04e6882a968453709deaf7415668f988958d1a12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a030ad125a90470bda9ec7008fd302a6f1a18bd413862acdef7717fc526445aba988e517d8272d63b3eff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e5c4b162efd5f281aa3048542b200e8e0a3708493788da7a27c52b4d658936a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0e4aea85964de3b48b58046801c3c4418d76775c24fcc9fb90c0ee760e97b3a1a88b0540976aa093552f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9149095011445e4f788f42641335dd3caf2a26308769771c15906fbefa8a4f37",
-        "network" : "EIP158",
+        "lastblockhash" : "0x93a80e1ae6ae519afeed65e7d94eedcfd1a9b528e295567d8a1e98642269b0ba",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_Gas2999_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_Gas2999_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/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +237,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x992f",
-                    "hash" : "0x899ce031c3496c8c91a2858fc59ef77f8243f2f18e42a47007b9d18511f879c9",
-                    "mixHash" : "0x74ce1ddf04534dbc43780f2ddb7538b8a1d0c1855807fe9bc8c2e97e52f076d6",
-                    "nonce" : "0xbe23f7f0a904667e",
+                    "gasUsed" : "0x9c59",
+                    "hash" : "0x57c4d1790b28edeffa4eca837c1ec6226dae7a810e10b10c3ab6ab26e501d42e",
+                    "mixHash" : "0x5836d4568fd760c8a5e9e9d68bf1ec212f7878ee0d7520bcf06b1a0f7230b343",
+                    "nonce" : "0x18ccfaf2df8147cc",
                     "number" : "0x01",
                     "parentHash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
-                    "receiptTrie" : "0x6efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958",
-                    "stateRoot" : "0x8bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5",
+                    "receiptTrie" : "0x2f9fe06645a5b2c4135bc8066c42a8782591c50ec4612eb94b36c51ca8369188",
+                    "stateRoot" : "0x8fd2e83540d3688c9ddefc21549b497c3c71d19ff90ab84b0fedc94e7c09028b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082992f8203e880a074ce1ddf04534dbc43780f2ddb7538b8a1d0c1855807fe9bc8c2e97e52f076d688be23f7f0a904667ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fd2e83540d3688c9ddefc21549b497c3c71d19ff90ab84b0fedc94e7c09028ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02f9fe06645a5b2c4135bc8066c42a8782591c50ec4612eb94b36c51ca8369188b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c598203e880a05836d4568fd760c8a5e9e9d68bf1ec212f7878ee0d7520bcf06b1a0f7230b3438818ccfaf2df8147ccf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x899ce031c3496c8c91a2858fc59ef77f8243f2f18e42a47007b9d18511f879c9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x57c4d1790b28edeffa4eca837c1ec6226dae7a810e10b10c3ab6ab26e501d42e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -283,14 +297,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4992f",
+                "balance" : "0x4563918244f49c59",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761e031",
+                "balance" : "0x0de0b6b3a761dd07",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +328,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_Gas2999_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_Gas2999_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/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -328,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x992f",
-                    "hash" : "0xc9a182a93923d695b43116f0d388ca1ffecc8e482fe27b8d45d87bfece9579f1",
-                    "mixHash" : "0x750acc7d960a2e98527fd5f137852beafa7d2a86a1d46a4fa99461091ff8f8ef",
-                    "nonce" : "0x60b5b593075148c4",
+                    "gasUsed" : "0x9c81",
+                    "hash" : "0x8c61e65fc5e52af6e7c9a3d05237ee6927adbbd50cf53782d431a4c88b96db51",
+                    "mixHash" : "0xbab41cca6bd4381d389bfe832fe712f10fbda95e1dea44151781a4f8f23a1f07",
+                    "nonce" : "0x325a535816b6beda",
                     "number" : "0x01",
                     "parentHash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
-                    "receiptTrie" : "0x6efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958",
-                    "stateRoot" : "0x8bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5",
+                    "receiptTrie" : "0x32b1f154a5ed8b929f3d5eaf04e6882a968453709deaf7415668f988958d1a12",
+                    "stateRoot" : "0xd74c3839be313882bd60d3e3af128b8b5f897ae4d46e04b3b9901a97d1ba72a4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082992f8203e880a0750acc7d960a2e98527fd5f137852beafa7d2a86a1d46a4fa99461091ff8f8ef8860b5b593075148c4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d74c3839be313882bd60d3e3af128b8b5f897ae4d46e04b3b9901a97d1ba72a4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba032b1f154a5ed8b929f3d5eaf04e6882a968453709deaf7415668f988958d1a12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0bab41cca6bd4381d389bfe832fe712f10fbda95e1dea44151781a4f8f23a1f0788325a535816b6bedaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9a182a93923d695b43116f0d388ca1ffecc8e482fe27b8d45d87bfece9579f1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8c61e65fc5e52af6e7c9a3d05237ee6927adbbd50cf53782d431a4c88b96db51",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -388,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4992f",
+                "balance" : "0x4563918244f49c81",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761e031",
+                "balance" : "0x0de0b6b3a761dcdf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +433,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_Gas2999_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_Gas2999_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/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x9c81",
-                    "hash" : "0xe78f98661d1de7ff9d0788746d09222180fe58e2a68b9c2548031d8b55f716d6",
-                    "mixHash" : "0xb6b0b006f325619b0575506cf9d4d5be2289b521a30eddb1b3f62c5a94c369a5",
-                    "nonce" : "0x44907bbc54379b47",
+                    "gasUsed" : "0x992f",
+                    "hash" : "0xc8afc93b1c990f5ac5b647698b77c4e84e262dde3dd8f6a10baf3939b7853f7f",
+                    "mixHash" : "0xfd8e9224ff42f7c8ba37360f1e7e6a2bb344ce5c5dea5e0d64d8f95cf379f78f",
+                    "nonce" : "0x39b3865ac07dbbab",
                     "number" : "0x01",
                     "parentHash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
-                    "receiptTrie" : "0x337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adf",
-                    "stateRoot" : "0x87e5c4b162efd5f281aa3048542b200e8e0a3708493788da7a27c52b4d658936",
+                    "receiptTrie" : "0x6efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958",
+                    "stateRoot" : "0x8bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e5c4b162efd5f281aa3048542b200e8e0a3708493788da7a27c52b4d658936a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0b6b0b006f325619b0575506cf9d4d5be2289b521a30eddb1b3f62c5a94c369a58844907bbc54379b47f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082992f8203e880a0fd8e9224ff42f7c8ba37360f1e7e6a2bb344ce5c5dea5e0d64d8f95cf379f78f8839b3865ac07dbbabf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe78f98661d1de7ff9d0788746d09222180fe58e2a68b9c2548031d8b55f716d6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc8afc93b1c990f5ac5b647698b77c4e84e262dde3dd8f6a10baf3939b7853f7f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4992f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761e031",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_Gas2999_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x992f",
+                    "hash" : "0x0ea83988013111009c30c6df4aa12c6e879b9ea0e77a4e9b8b2dd7375677b386",
+                    "mixHash" : "0xa985e8753a2fc70a058d9a0640725e430e947eb1082a78e522e07bd88cc6f7d6",
+                    "nonce" : "0xa12ca79a6a27323a",
+                    "number" : "0x01",
+                    "parentHash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
+                    "receiptTrie" : "0x6efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958",
+                    "stateRoot" : "0x8bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a047f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc02469a3e8ded327d81117e355dc9da58f72f6e9f3f9c9ec656532e1dde8a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06efbb55022e3f6ad0c8f81aa04fbdbf38e785e3a62e54e00133befecff2cc958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082992f8203e880a0a985e8753a2fc70a058d9a0640725e430e947eb1082a78e522e07bd88cc6f7d688a12ca79a6a27323af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x47f02113f682840da81ca98a833b10dcbcc55b02fcad57187ee75153ec15843d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a879e30f4d69db416383e398c27ba9704644c2474ba2cf2b1f29c38e38e2bb1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0ea83988013111009c30c6df4aa12c6e879b9ea0e77a4e9b8b2dd7375677b386",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155",
@@ -500,14 +612,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49c81",
+                "balance" : "0x4563918244f4992f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761dcdf",
+                "balance" : "0x0de0b6b3a761e031",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0.json
index 48b61b35c..69ed8878c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_NoGas_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_NoGas_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/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb3ca",
-                    "hash" : "0xe370e7d6ed3686ab87fe5a13ee1acf714ff2f121398cc00aebc28af6f6a4d71a",
-                    "mixHash" : "0x7a2304e9ff649b2d95bbd13d5d339dc735375918957f9157ea0fde801f4ba721",
-                    "nonce" : "0x623e665ea029ba8a",
+                    "gasUsed" : "0xb3f2",
+                    "hash" : "0x68bf2ac045cf5b52e94be3b2b0926f609b8a38eecffcf8224f42416cf1ed98ef",
+                    "mixHash" : "0x4629608eda6d085b622888a6533987c081358038fb4c30fb90d6ab01118adea7",
+                    "nonce" : "0x9ae86bb1012dac5c",
                     "number" : "0x01",
                     "parentHash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
-                    "receiptTrie" : "0xb1dd3735b2d66bd5ab30180d27a3eb1fd053cb743c20cce034e6c50548968c19",
-                    "stateRoot" : "0xc2f6c0f74ce933b9477a1a7354923fa805d500a90ac37792c99346dcb5c6b2c2",
+                    "receiptTrie" : "0x97b882a96bf670b31b6525ea0b05a0368189793f11b9b0becfd166b2f5887786",
+                    "stateRoot" : "0xd47378250592d967ec4575a4ae10c58449c6312298b6ce0d78060fa438090125",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2f6c0f74ce933b9477a1a7354923fa805d500a90ac37792c99346dcb5c6b2c2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1dd3735b2d66bd5ab30180d27a3eb1fd053cb743c20cce034e6c50548968c19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3ca8203e880a07a2304e9ff649b2d95bbd13d5d339dc735375918957f9157ea0fde801f4ba72188623e665ea029ba8af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d47378250592d967ec4575a4ae10c58449c6312298b6ce0d78060fa438090125a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097b882a96bf670b31b6525ea0b05a0368189793f11b9b0becfd166b2f5887786b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3f28203e880a04629608eda6d085b622888a6533987c081358038fb4c30fb90d6ab01118adea7889ae86bb1012dac5cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe370e7d6ed3686ab87fe5a13ee1acf714ff2f121398cc00aebc28af6f6a4d71a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x68bf2ac045cf5b52e94be3b2b0926f609b8a38eecffcf8224f42416cf1ed98ef",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b3ca",
+                "balance" : "0x4563918244f4b3f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c596",
+                "balance" : "0x0de0b6b3a761c56e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_NoGas_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_NoGas_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/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb3f2",
-                    "hash" : "0xb16c905a9323f54a63842e5bafcda01a9244338f3e2b515a2561f670164f7208",
-                    "mixHash" : "0x61300df481d0039a6f0e13f1b70736f60218e87e22d64067135193eb957e6b5f",
-                    "nonce" : "0xaa05b8ace8222e9e",
+                    "hash" : "0xc4e5e80bcda216cdd5fe4b6e612a4a1b346f87430b736a99fda8ca59e859f87b",
+                    "mixHash" : "0x8ee4bcf5c4165f82b6414370184d7d4f50e62818463114ef4d700caf5956f66c",
+                    "nonce" : "0x0123ccc9626ded33",
                     "number" : "0x01",
                     "parentHash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
-                    "receiptTrie" : "0x283d2ed2cad85df17336aba2350e013f6e1bdafc263a55fd018977ec9805a2ea",
-                    "stateRoot" : "0xb6639de0a3bd9df1be1690a23899989fddcd3007919fdf719f9f1b769abd2861",
+                    "receiptTrie" : "0x97b882a96bf670b31b6525ea0b05a0368189793f11b9b0becfd166b2f5887786",
+                    "stateRoot" : "0xd47378250592d967ec4575a4ae10c58449c6312298b6ce0d78060fa438090125",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6639de0a3bd9df1be1690a23899989fddcd3007919fdf719f9f1b769abd2861a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0283d2ed2cad85df17336aba2350e013f6e1bdafc263a55fd018977ec9805a2eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3f28203e880a061300df481d0039a6f0e13f1b70736f60218e87e22d64067135193eb957e6b5f88aa05b8ace8222e9ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d47378250592d967ec4575a4ae10c58449c6312298b6ce0d78060fa438090125a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097b882a96bf670b31b6525ea0b05a0368189793f11b9b0becfd166b2f5887786b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3f28203e880a08ee4bcf5c4165f82b6414370184d7d4f50e62818463114ef4d700caf5956f66c880123ccc9626ded33f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb16c905a9323f54a63842e5bafcda01a9244338f3e2b515a2561f670164f7208",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc4e5e80bcda216cdd5fe4b6e612a4a1b346f87430b736a99fda8ca59e859f87b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_NoGas_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_NoGas_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/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +237,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb0a0",
-                    "hash" : "0x1a81cab57a3ace22418aa469c167ff5bc2a49fbec420bda8a0c40bb644e2e7ce",
-                    "mixHash" : "0xfeb4363b4fb15a3cc82fa35d178423a27286dc45c403e8d6932448ad4b394f80",
-                    "nonce" : "0xe3e0a462fb38aa2e",
+                    "gasUsed" : "0xb3ca",
+                    "hash" : "0x0d8a0fae97aa7e8a400cc6b7e48839474031d0deb3da8f6908b7841e32d2e734",
+                    "mixHash" : "0xd04c4f131a76b398b86faba6353ac2576f2b09c39b8b8c364541f4b0bf9b1466",
+                    "nonce" : "0xb8e9f928446aa46d",
                     "number" : "0x01",
                     "parentHash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
-                    "receiptTrie" : "0xcc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426",
-                    "stateRoot" : "0xd37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0",
+                    "receiptTrie" : "0xb1dd3735b2d66bd5ab30180d27a3eb1fd053cb743c20cce034e6c50548968c19",
+                    "stateRoot" : "0xc2f6c0f74ce933b9477a1a7354923fa805d500a90ac37792c99346dcb5c6b2c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b0a08203e880a0feb4363b4fb15a3cc82fa35d178423a27286dc45c403e8d6932448ad4b394f8088e3e0a462fb38aa2ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2f6c0f74ce933b9477a1a7354923fa805d500a90ac37792c99346dcb5c6b2c2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1dd3735b2d66bd5ab30180d27a3eb1fd053cb743c20cce034e6c50548968c19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3ca8203e880a0d04c4f131a76b398b86faba6353ac2576f2b09c39b8b8c364541f4b0bf9b146688b8e9f928446aa46df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a81cab57a3ace22418aa469c167ff5bc2a49fbec420bda8a0c40bb644e2e7ce",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0d8a0fae97aa7e8a400cc6b7e48839474031d0deb3da8f6908b7841e32d2e734",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -283,14 +297,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b0a0",
+                "balance" : "0x4563918244f4b3ca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c8c0",
+                "balance" : "0x0de0b6b3a761c596",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +328,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_NoGas_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_NoGas_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/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -328,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb0a0",
-                    "hash" : "0x008413e188ebf85ce247304c99004e0c8003c436c590b8bb80b57b4b3792278c",
-                    "mixHash" : "0x25d0870dbc2768f817d889a2432022e6c9745dfa41be59e349bd460e2b144750",
-                    "nonce" : "0x64c6482df0ba2e96",
+                    "gasUsed" : "0xb3f2",
+                    "hash" : "0x133350456309836935d1ea01864b93afdea01aaf841e0c5c35cb285d3ff6c807",
+                    "mixHash" : "0x72896bdd554f36e3ff3318d3bf8c3769ac5034acd172421e9809f55a042425e7",
+                    "nonce" : "0x87d28c4c05781afe",
                     "number" : "0x01",
                     "parentHash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
-                    "receiptTrie" : "0xcc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426",
-                    "stateRoot" : "0xd37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0",
+                    "receiptTrie" : "0x283d2ed2cad85df17336aba2350e013f6e1bdafc263a55fd018977ec9805a2ea",
+                    "stateRoot" : "0xb6639de0a3bd9df1be1690a23899989fddcd3007919fdf719f9f1b769abd2861",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b0a08203e880a025d0870dbc2768f817d889a2432022e6c9745dfa41be59e349bd460e2b1447508864c6482df0ba2e96f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6639de0a3bd9df1be1690a23899989fddcd3007919fdf719f9f1b769abd2861a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0283d2ed2cad85df17336aba2350e013f6e1bdafc263a55fd018977ec9805a2eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3f28203e880a072896bdd554f36e3ff3318d3bf8c3769ac5034acd172421e9809f55a042425e78887d28c4c05781afef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x008413e188ebf85ce247304c99004e0c8003c436c590b8bb80b57b4b3792278c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x133350456309836935d1ea01864b93afdea01aaf841e0c5c35cb285d3ff6c807",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -388,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b0a0",
+                "balance" : "0x4563918244f4b3f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c8c0",
+                "balance" : "0x0de0b6b3a761c56e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +433,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_NoGas_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_NoGas_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/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb3f2",
-                    "hash" : "0x534a3538fbe8bec132344be52a403ee2cf35849f8114d05391d37b8f673be3f8",
-                    "mixHash" : "0xce9ef7086800211c8b378d07aa9f593bbc6521e063f5814eb1c674e47db74584",
-                    "nonce" : "0xeafbcded427df0cb",
+                    "gasUsed" : "0xb0a0",
+                    "hash" : "0xb79ba4e40769c572011e7b27365bd950a8e468fccba5f604eac47d367983f863",
+                    "mixHash" : "0x5dd2caceae49c7ab525ba61bb60f88d9dcdfa3a0d5b7fb97b034646098743778",
+                    "nonce" : "0xb97d3e8967177122",
                     "number" : "0x01",
                     "parentHash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
-                    "receiptTrie" : "0x97b882a96bf670b31b6525ea0b05a0368189793f11b9b0becfd166b2f5887786",
-                    "stateRoot" : "0xd47378250592d967ec4575a4ae10c58449c6312298b6ce0d78060fa438090125",
+                    "receiptTrie" : "0xcc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426",
+                    "stateRoot" : "0xd37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d47378250592d967ec4575a4ae10c58449c6312298b6ce0d78060fa438090125a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097b882a96bf670b31b6525ea0b05a0368189793f11b9b0becfd166b2f5887786b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b3f28203e880a0ce9ef7086800211c8b378d07aa9f593bbc6521e063f5814eb1c674e47db7458488eafbcded427df0cbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b0a08203e880a05dd2caceae49c7ab525ba61bb60f88d9dcdfa3a0d5b7fb97b03464609874377888b97d3e8967177122f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x534a3538fbe8bec132344be52a403ee2cf35849f8114d05391d37b8f673be3f8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb79ba4e40769c572011e7b27365bd950a8e468fccba5f604eac47d367983f863",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b0a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761c8c0",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_NoGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xb0a0",
+                    "hash" : "0x10fd2a7d9f54f16683d1d16e70f99f87e1dd792b06dd7b7215a37fed724cd008",
+                    "mixHash" : "0x0c2d7067299766f19214c8bb1524eeb2f6acd021b90546daf482ec7a8a7b9655",
+                    "nonce" : "0x47005b373c634967",
+                    "number" : "0x01",
+                    "parentHash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
+                    "receiptTrie" : "0xcc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426",
+                    "stateRoot" : "0xd37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0ddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37b6aba0f906159a781ea72d2b368039106ffe9b1c70ed95637f78c565b42f0a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cc35c1a68507172ea48c3a98c83063d3f0ebb08d113194741e46d2beed33c426b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b0a08203e880a00c2d7067299766f19214c8bb1524eeb2f6acd021b90546daf482ec7a8a7b96558847005b373c634967f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xddd81c59a275d7a7fa92076e42efeea635e43809c5b8759bb8f722aa90cc6cfb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c1754c1826e0b0b7c0cee4c341a9c4134af1fdc3efb2f420d372dc8c9eee7aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x10fd2a7d9f54f16683d1d16e70f99f87e1dd792b06dd7b7215a37fed724cd008",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155",
@@ -500,14 +612,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b3f2",
+                "balance" : "0x4563918244f4b0a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c56e",
+                "balance" : "0x0de0b6b3a761c8c0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0.json
index e195d880b..89856948f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_completeReturnValue_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_completeReturnValue_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/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xfd10",
-                    "hash" : "0x71bf21e1583b19d0c3a85c8147326f13fac1d4d769a84a121ac8cf89f7f5379c",
-                    "mixHash" : "0x9fda992a783963bb8cd5d117d99084e9099f7926b4bb473e0e710724839a2ab8",
-                    "nonce" : "0x0a362e998aa71555",
+                    "hash" : "0x5096af76a837b17c015a4082f5140c7915bc9f3b5eafd6a354812908e674e66f",
+                    "mixHash" : "0xa11e590085c1a483552fb410ac094158cc356a611d18dd0dae75580ff42f3135",
+                    "nonce" : "0x7840b0ffb9398bc2",
                     "number" : "0x01",
                     "parentHash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
-                    "receiptTrie" : "0xc3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febde",
-                    "stateRoot" : "0xb61ca882359ad3eaa391b49ea0ef7c9a3924c76d57bad4ef9df42f058cbbf2a2",
+                    "receiptTrie" : "0xe764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7",
+                    "stateRoot" : "0x4bc33b1e94a5103407f4d821004ead21d3bfad2175a4de0bb5fcf65372277280",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61ca882359ad3eaa391b49ea0ef7c9a3924c76d57bad4ef9df42f058cbbf2a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a09fda992a783963bb8cd5d117d99084e9099f7926b4bb473e0e710724839a2ab8880a362e998aa71555f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bc33b1e94a5103407f4d821004ead21d3bfad2175a4de0bb5fcf65372277280a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a0a11e590085c1a483552fb410ac094158cc356a611d18dd0dae75580ff42f3135887840b0ffb9398bc2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71bf21e1583b19d0c3a85c8147326f13fac1d4d769a84a121ac8cf89f7f5379c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5096af76a837b17c015a4082f5140c7915bc9f3b5eafd6a354812908e674e66f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f2600255608051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODEEcrecover0_completeReturnValue_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_completeReturnValue_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xfd10",
+                    "hash" : "0x67cebc3c4d773ff6a62e6a2deb236de048f0eee355ad86295dfe2fc712e4e680",
+                    "mixHash" : "0x8bc60175ab8825c7e5e8378841daf3b54e10c0e85dd31fbca6b6fe2cb2289334",
+                    "nonce" : "0x4a61fdb6f47a56af",
+                    "number" : "0x01",
+                    "parentHash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
+                    "receiptTrie" : "0xe764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7",
+                    "stateRoot" : "0x4bc33b1e94a5103407f4d821004ead21d3bfad2175a4de0bb5fcf65372277280",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bc33b1e94a5103407f4d821004ead21d3bfad2175a4de0bb5fcf65372277280a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a08bc60175ab8825c7e5e8378841daf3b54e10c0e85dd31fbca6b6fe2cb2289334884a61fdb6f47a56aff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67cebc3c4d773ff6a62e6a2deb236de048f0eee355ad86295dfe2fc712e4e680",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f2600255608051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4fd10",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7617c50",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f2600255608051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_completeReturnValue_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/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xfd10",
-                    "hash" : "0x2684e1176f1137cc38067956d9b481c3c7e8e8eb7c225655040500046895e8db",
-                    "mixHash" : "0x071b444060681a2d6717fd1b14100f74e74eb96fe2a36acaf1232eff499c726d",
-                    "nonce" : "0x0beedb9b6db1cb93",
+                    "hash" : "0x2b2c0f2ee759786ad9b091f5176614c754202d6abfb11fc1da74b27de6370aac",
+                    "mixHash" : "0xd15a4e2e26718500528b4251e9a06d8ca2cb6ee49ad1180f3c5a6b0cd7399ebf",
+                    "nonce" : "0x2fdf277f7963232c",
                     "number" : "0x01",
                     "parentHash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
                     "receiptTrie" : "0xc3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febde",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61ca882359ad3eaa391b49ea0ef7c9a3924c76d57bad4ef9df42f058cbbf2a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a0071b444060681a2d6717fd1b14100f74e74eb96fe2a36acaf1232eff499c726d880beedb9b6db1cb93f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61ca882359ad3eaa391b49ea0ef7c9a3924c76d57bad4ef9df42f058cbbf2a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a0d15a4e2e26718500528b4251e9a06d8ca2cb6ee49ad1180f3c5a6b0cd7399ebf882fdf277f7963232cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2684e1176f1137cc38067956d9b481c3c7e8e8eb7c225655040500046895e8db",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2b2c0f2ee759786ad9b091f5176614c754202d6abfb11fc1da74b27de6370aac",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_completeReturnValue_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_completeReturnValue_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/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfa7c",
-                    "hash" : "0xbb3e9564ec11c21ba9a8390ba69cd96555414b6649f95dce15f56534010e8500",
-                    "mixHash" : "0xf4191d7f915a6b8259055f04f4733f08230f06d4e77ac10fa4ef1b799ccd7700",
-                    "nonce" : "0xf935f40e538bff4d",
+                    "gasUsed" : "0xfd10",
+                    "hash" : "0x23ce158060accfd14b36ab23d1bedab04273543f032d62a20c237d79352c492a",
+                    "mixHash" : "0x8e7a3c696106d3690e244b38b5f5d1facac819d91d8df9cb54351a47f1928097",
+                    "nonce" : "0x77f5c76601a31061",
                     "number" : "0x01",
                     "parentHash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
-                    "receiptTrie" : "0xc3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9df",
-                    "stateRoot" : "0x670323f93f01030859ddf9e072e3880975de311ff819810bacad8fc21a185814",
+                    "receiptTrie" : "0xc3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febde",
+                    "stateRoot" : "0xb61ca882359ad3eaa391b49ea0ef7c9a3924c76d57bad4ef9df42f058cbbf2a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0670323f93f01030859ddf9e072e3880975de311ff819810bacad8fc21a185814a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa7c8203e880a0f4191d7f915a6b8259055f04f4733f08230f06d4e77ac10fa4ef1b799ccd770088f935f40e538bff4df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61ca882359ad3eaa391b49ea0ef7c9a3924c76d57bad4ef9df42f058cbbf2a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3d697cbfe77320f6e794e20806a4e61539fbc8fb3ec5a91be0b4503fd3febdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a08e7a3c696106d3690e244b38b5f5d1facac819d91d8df9cb54351a47f19280978877f5c76601a31061f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb3e9564ec11c21ba9a8390ba69cd96555414b6649f95dce15f56534010e8500",
-        "network" : "Frontier",
+        "lastblockhash" : "0x23ce158060accfd14b36ab23d1bedab04273543f032d62a20c237d79352c492a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fa7c",
+                "balance" : "0x4563918244f4fd10",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617ee4",
+                "balance" : "0x0de0b6b3a7617c50",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_completeReturnValue_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_completeReturnValue_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/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xfa7c",
-                    "hash" : "0x4b7db097a6ad93c68791bc953e64227396e7abd42b58ad9ee248b724ede9dd39",
-                    "mixHash" : "0x4a3bd3cd8693436b8f5e40056e455c90bb06d0389be7d4f45944967316829025",
-                    "nonce" : "0x88fe47e384c1151f",
+                    "hash" : "0x1d81040bd111cee2b4f6b36062652688356762ffe7cab79796ccbb09a682e025",
+                    "mixHash" : "0x2ca5674f11d5a504db5a2ae63afa02784b53b75a55ffd7b6936fd8c10ca28173",
+                    "nonce" : "0x7d3c712bf1194f5d",
                     "number" : "0x01",
                     "parentHash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
                     "receiptTrie" : "0xc3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9df",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0670323f93f01030859ddf9e072e3880975de311ff819810bacad8fc21a185814a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa7c8203e880a04a3bd3cd8693436b8f5e40056e455c90bb06d0389be7d4f459449673168290258888fe47e384c1151ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0670323f93f01030859ddf9e072e3880975de311ff819810bacad8fc21a185814a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa7c8203e880a02ca5674f11d5a504db5a2ae63afa02784b53b75a55ffd7b6936fd8c10ca28173887d3c712bf1194f5df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b7db097a6ad93c68791bc953e64227396e7abd42b58ad9ee248b724ede9dd39",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1d81040bd111cee2b4f6b36062652688356762ffe7cab79796ccbb09a682e025",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_completeReturnValue_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_completeReturnValue_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/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfd10",
-                    "hash" : "0xf1c463313810f5be1b5b12fda0b923b42424118e8103bb9d78ea4038307847d6",
-                    "mixHash" : "0x9f832da593cb1331956e85aac46aed6359a870488e257e2d367818a7d511e449",
-                    "nonce" : "0xda837aa21d4fa0f5",
+                    "gasUsed" : "0xfa7c",
+                    "hash" : "0xa40e06e8bb441c72ad7fcb929a78883e18084309eb0ae9794651678ff959d144",
+                    "mixHash" : "0xed04823c66624cf0936cb1667f1c24709027cc98e3f8558f92231b367c75c19f",
+                    "nonce" : "0x36ce9fd782df2bb6",
                     "number" : "0x01",
                     "parentHash" : "0x1b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbead",
-                    "receiptTrie" : "0xe764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7",
-                    "stateRoot" : "0x4bc33b1e94a5103407f4d821004ead21d3bfad2175a4de0bb5fcf65372277280",
+                    "receiptTrie" : "0xc3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9df",
+                    "stateRoot" : "0x670323f93f01030859ddf9e072e3880975de311ff819810bacad8fc21a185814",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bc33b1e94a5103407f4d821004ead21d3bfad2175a4de0bb5fcf65372277280a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a09f832da593cb1331956e85aac46aed6359a870488e257e2d367818a7d511e44988da837aa21d4fa0f5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01b33905f98b6674133016322cbda1781d37656e22b210610d9ba57cc01fdbeada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0670323f93f01030859ddf9e072e3880975de311ff819810bacad8fc21a185814a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c3c641fc325ca92b5b95171c235334afc5956a6b2ffe48e8563a513afd1fc9dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa7c8203e880a0ed04823c66624cf0936cb1667f1c24709027cc98e3f8558f92231b367c75c19f8836ce9fd782df2bb6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91436745ce2b9e4d69ff78c226c01d7930bf42ed011258cc4c67490bdb090fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1c463313810f5be1b5b12fda0b923b42424118e8103bb9d78ea4038307847d6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa40e06e8bb441c72ad7fcb929a78883e18084309eb0ae9794651678ff959d144",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f2600255608051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fd10",
+                "balance" : "0x4563918244f4fa7c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617c50",
+                "balance" : "0x0de0b6b3a7617ee4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0.json
index dbe9e62b5..f073f54e4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_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/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c22",
-                    "hash" : "0xb3b232c2010f25dfcbffe3e6647849be370cb8e074d81068b401c3611f998b0c",
-                    "mixHash" : "0xfc59eee1dd749f167fd723896b7296c933a60e6bc49a9c105994a2f0b65a896e",
-                    "nonce" : "0x062f482d65b06ce3",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x7e8a0280f689f4dd3153dff3bb164357c567715c558d561facff9fde0c49c40c",
+                    "mixHash" : "0x55b561925a9d0c9ae0e4149e818a916f2ecd0d7f019e35a76bcef0ae9ef30c70",
+                    "nonce" : "0x450d4174e6f898a9",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0xf1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47",
-                    "stateRoot" : "0xc93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xcaa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86faf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c228203e880a0fc59eee1dd749f167fd723896b7296c933a60e6bc49a9c105994a2f0b65a896e88062f482d65b06ce3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0caa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86fafa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a055b561925a9d0c9ae0e4149e818a916f2ecd0d7f019e35a76bcef0ae9ef30c7088450d4174e6f898a9f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3b232c2010f25dfcbffe3e6647849be370cb8e074d81068b401c3611f998b0c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7e8a0280f689f4dd3153dff3bb164357c567715c558d561facff9fde0c49c40c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -76,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c22",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d3e",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -107,10 +114,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_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/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c4a",
-                    "hash" : "0x5ba5bfa6dacc143a4f14566004f5520d098b0a3d3b687dd1eb8e86b5d372ab0b",
-                    "mixHash" : "0x08bfb7cd56081a9f8777f19a9caef485466d15ce52fe7ce6d5fb317737d5758b",
-                    "nonce" : "0xc422487e0ef490de",
+                    "hash" : "0xe6ca9a24c634036ce8d3f935c714c8c49a6f79b678dfd04fb73c0dfb6d3e3ac7",
+                    "mixHash" : "0x448ea06e4752ee0ac13d3edd27ab92c09cab60ed2621df0b9c086e7b727b92b3",
+                    "nonce" : "0xf03208de5012c1b6",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0x3e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4a",
-                    "stateRoot" : "0x3c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xcaa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86faf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a03e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a008bfb7cd56081a9f8777f19a9caef485466d15ce52fe7ce6d5fb317737d5758b88c422487e0ef490def865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0caa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86fafa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0448ea06e4752ee0ac13d3edd27ab92c09cab60ed2621df0b9c086e7b727b92b388f03208de5012c1b6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -170,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ba5bfa6dacc143a4f14566004f5520d098b0a3d3b687dd1eb8e86b5d372ab0b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe6ca9a24c634036ce8d3f935c714c8c49a6f79b678dfd04fb73c0dfb6d3e3ac7",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_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/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -229,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f8",
-                    "hash" : "0xb25dc9927c872b1be7c97803eb790d731ebd2db5543cdd4ee4ac781bc574b16f",
-                    "mixHash" : "0x8b0c76aaf02969d3e1d37bdfa2e349111a4b89b73f113bb97cb45daa4954821c",
-                    "nonce" : "0x1a6db5510ee17f51",
+                    "gasUsed" : "0x014c22",
+                    "hash" : "0x470242e96089c3a4b636415c1666374c0626370a8070112b4e62e767d4ee1c5d",
+                    "mixHash" : "0xdd6f6a09f106ed1771f4e7a458de6212a833c0ef5deb99d060f037a8eae55291",
+                    "nonce" : "0xa2e1702703d61367",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
-                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
+                    "receiptTrie" : "0xf1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47",
+                    "stateRoot" : "0xc93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a08b0c76aaf02969d3e1d37bdfa2e349111a4b89b73f113bb97cb45daa4954821c881a6db5510ee17f51f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c228203e880a0dd6f6a09f106ed1771f4e7a458de6212a833c0ef5deb99d060f037a8eae5529188a2e1702703d61367f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -278,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb25dc9927c872b1be7c97803eb790d731ebd2db5543cdd4ee4ac781bc574b16f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x470242e96089c3a4b636415c1666374c0626370a8070112b4e62e767d4ee1c5d",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -292,14 +306,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f8",
+                "balance" : "0x4563918244f54c22",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7613068",
+                "balance" : "0x0de0b6b3a7612d3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -323,10 +337,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_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/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -337,19 +351,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f8",
-                    "hash" : "0x673b5fc69501d28fe3fc6b13285f7175b7157bac86bfc6273442ee45d761661d",
-                    "mixHash" : "0x4d4a28dbe57ff47e1145a9bec8161a2efc918b092d6943e0924b38bd4bae21f5",
-                    "nonce" : "0x255f1cccac93987c",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x0ec0ee18ebeab727dc2f7339c88631bd98f4f068bcbafd8fb838d3bb422eed73",
+                    "mixHash" : "0x91f50e757f13778c81addb0331a4163eb55e9804389a0bb9a66cae2d19d08ebe",
+                    "nonce" : "0x02ad74d1a29a2896",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
-                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
+                    "receiptTrie" : "0x3e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4a",
+                    "stateRoot" : "0x3c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a04d4a28dbe57ff47e1145a9bec8161a2efc918b092d6943e0924b38bd4bae21f588255f1cccac93987cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a03e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a091f50e757f13778c81addb0331a4163eb55e9804389a0bb9a66cae2d19d08ebe8802ad74d1a29a2896f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -386,8 +400,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x673b5fc69501d28fe3fc6b13285f7175b7157bac86bfc6273442ee45d761661d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0ec0ee18ebeab727dc2f7339c88631bd98f4f068bcbafd8fb838d3bb422eed73",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -400,14 +414,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f8",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7613068",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -431,10 +445,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_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/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -445,19 +459,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c4a",
-                    "hash" : "0xbb24f37b002b2c5267db52c6d2b18d5f79d652769929e1403edceee3da72ccfd",
-                    "mixHash" : "0x9b3e17735af80f51c7ab26ef0cc7c5b88a19f873b1adf04e7468ac96306ed893",
-                    "nonce" : "0xdbcf7a06f9c68bac",
+                    "gasUsed" : "0x0148f8",
+                    "hash" : "0x00d1fe6c2962a6b090e519e9fbd46f3eff42723d3fc4c69c15c5f211a926468c",
+                    "mixHash" : "0x01a39f7e8cf8bafc80cc46f6e1db7059ad1bf3b0e95bf447cfe23ebc056e3931",
+                    "nonce" : "0x267e9aee5afc9752",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
-                    "stateRoot" : "0xcaa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86faf",
+                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
+                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0caa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86fafa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a09b3e17735af80f51c7ab26ef0cc7c5b88a19f873b1adf04e7468ac96306ed89388dbcf7a06f9c68bacf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a001a39f7e8cf8bafc80cc46f6e1db7059ad1bf3b0e95bf447cfe23ebc056e393188267e9aee5afc9752f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -494,16 +508,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb24f37b002b2c5267db52c6d2b18d5f79d652769929e1403edceee3da72ccfd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x00d1fe6c2962a6b090e519e9fbd46f3eff42723d3fc4c69c15c5f211a926468c",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548f8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7613068",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0148f8",
+                    "hash" : "0xf9f2f67a895bb79fab9a0cbb61d8cbc3f0ab712fc541c7f58cf27f50d629d46b",
+                    "mixHash" : "0xeb6ccf6c0af72b9d273f7839407a6f55a039fa10c5fa56bf57bf27d826e1fea9",
+                    "nonce" : "0xb4519f8da48cddd9",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
+                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
+                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a0eb6ccf6c0af72b9d273f7839407a6f55a039fa10c5fa56bf57bf27d826e1fea988b4519f8da48cddd9f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf9f2f67a895bb79fab9a0cbb61d8cbc3f0ab712fc541c7f58cf27f50d629d46b",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -515,14 +630,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c4a",
+                "balance" : "0x4563918244f548f8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d16",
+                "balance" : "0x0de0b6b3a7613068",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0.json
index 3cd92bf6c..db836bb02 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_gas3000_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_gas3000_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/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c22",
-                    "hash" : "0x6d61177a5b8811ec48d1f593946efe9c8b8cee1870b333eaac2543e4e1f16165",
-                    "mixHash" : "0x6e8f52e713a1ee1e3b2e249be49731c661bd362b38afb8a5e8b3c0ebaf74b2d5",
-                    "nonce" : "0x27763795fd606958",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0xac02758cd16d1c43dc3fb2b9efd58fe5a55bb3b3cac300c04ed704972e5f0f7a",
+                    "mixHash" : "0x967b4689398428a6b8390c93694f8831a5fe75a144f475f2cf7e7d5efb8c2fd2",
+                    "nonce" : "0x72f61cd5402635fc",
                     "number" : "0x01",
                     "parentHash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
-                    "receiptTrie" : "0x57aa188de1b22596fbf58e1fe0b6e5ffd6ff9973b2272dffaa1f6cf08c1e4f7d",
-                    "stateRoot" : "0xa368c5db3567d70bd7364f808c88fb437621d38c12d4e77b1fafdbe5c96b9db5",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0x0b0849ad032183dc504c288f2a2803b39ea902754c0d3fff75066bc8101a51c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a368c5db3567d70bd7364f808c88fb437621d38c12d4e77b1fafdbe5c96b9db5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba057aa188de1b22596fbf58e1fe0b6e5ffd6ff9973b2272dffaa1f6cf08c1e4f7db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c228203e880a06e8f52e713a1ee1e3b2e249be49731c661bd362b38afb8a5e8b3c0ebaf74b2d58827763795fd606958f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b0849ad032183dc504c288f2a2803b39ea902754c0d3fff75066bc8101a51c2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0967b4689398428a6b8390c93694f8831a5fe75a144f475f2cf7e7d5efb8c2fd28872f61cd5402635fcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d61177a5b8811ec48d1f593946efe9c8b8cee1870b333eaac2543e4e1f16165",
-        "network" : "EIP150",
+        "lastblockhash" : "0xac02758cd16d1c43dc3fb2b9efd58fe5a55bb3b3cac300c04ed704972e5f0f7a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155",
@@ -76,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c22",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d3e",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -107,10 +114,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_gas3000_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_gas3000_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/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c4a",
-                    "hash" : "0xb7939ffd6874fb75463c8ccc20507488b51979311d74f86ec901bceb4117c1d0",
-                    "mixHash" : "0xa011159a535aebd723a203e4910b20eed01912afd9c4b3e2d842371937fa7147",
-                    "nonce" : "0x4f4e354f71533ef2",
+                    "hash" : "0xcd649e1034eb7977733377a303b010d99c0cbd9b68f03236df7393e7a591d11d",
+                    "mixHash" : "0xefb3c4ad00e0728c4ec7d265119e803df6886dfbe77af30020fe0d8f59c50871",
+                    "nonce" : "0x7504bd87e5208521",
                     "number" : "0x01",
                     "parentHash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
-                    "receiptTrie" : "0xf4849c01098c158f7efb57fbc43bfdb51286cbeff826dfefe1c3e70d81836087",
-                    "stateRoot" : "0x93a2d701fa0de14827591c374a2fd55ee6ac021f46aba2c8d1c0dd2d32514777",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0x0b0849ad032183dc504c288f2a2803b39ea902754c0d3fff75066bc8101a51c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093a2d701fa0de14827591c374a2fd55ee6ac021f46aba2c8d1c0dd2d32514777a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f4849c01098c158f7efb57fbc43bfdb51286cbeff826dfefe1c3e70d81836087b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0a011159a535aebd723a203e4910b20eed01912afd9c4b3e2d842371937fa7147884f4e354f71533ef2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b0849ad032183dc504c288f2a2803b39ea902754c0d3fff75066bc8101a51c2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0efb3c4ad00e0728c4ec7d265119e803df6886dfbe77af30020fe0d8f59c50871887504bd87e5208521f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -170,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7939ffd6874fb75463c8ccc20507488b51979311d74f86ec901bceb4117c1d0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcd649e1034eb7977733377a303b010d99c0cbd9b68f03236df7393e7a591d11d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_gas3000_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_gas3000_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/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -229,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f8",
-                    "hash" : "0x9cf865d65b2980906d633ade43551a0635e46cf57246468f151233565d9b00cc",
-                    "mixHash" : "0xd69a0942803e29999259538cbcf472c009e8815de5c978eedaa69185e64bd67d",
-                    "nonce" : "0x73a3eaf83de585cc",
+                    "gasUsed" : "0x014c22",
+                    "hash" : "0x69bfc75b48e780de5b938c9cbda74e17f19932628f3742bf6f14198cc4724f0c",
+                    "mixHash" : "0x8e35fccbce040241605ab1d8cddd05ce46e22205c4258eb1e350934fa7be68bc",
+                    "nonce" : "0x15ceab29950ff599",
                     "number" : "0x01",
                     "parentHash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
-                    "receiptTrie" : "0xd9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885",
-                    "stateRoot" : "0x41832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdade",
+                    "receiptTrie" : "0x57aa188de1b22596fbf58e1fe0b6e5ffd6ff9973b2272dffaa1f6cf08c1e4f7d",
+                    "stateRoot" : "0xa368c5db3567d70bd7364f808c88fb437621d38c12d4e77b1fafdbe5c96b9db5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdadea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a0d69a0942803e29999259538cbcf472c009e8815de5c978eedaa69185e64bd67d8873a3eaf83de585ccf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a368c5db3567d70bd7364f808c88fb437621d38c12d4e77b1fafdbe5c96b9db5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba057aa188de1b22596fbf58e1fe0b6e5ffd6ff9973b2272dffaa1f6cf08c1e4f7db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c228203e880a08e35fccbce040241605ab1d8cddd05ce46e22205c4258eb1e350934fa7be68bc8815ceab29950ff599f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -278,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cf865d65b2980906d633ade43551a0635e46cf57246468f151233565d9b00cc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x69bfc75b48e780de5b938c9cbda74e17f19932628f3742bf6f14198cc4724f0c",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -292,14 +306,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f8",
+                "balance" : "0x4563918244f54c22",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7613068",
+                "balance" : "0x0de0b6b3a7612d3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -323,10 +337,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_gas3000_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_gas3000_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/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -337,19 +351,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f8",
-                    "hash" : "0xf67a93801e01e46590c735ebd48a216762a802dded7b1ace13faa2f0c96d7b9d",
-                    "mixHash" : "0x4c78b389dab64d24b6db9acd2603418640b10607d5c57f26f46b89c8a4eb1316",
-                    "nonce" : "0x7e4813d93fd7c373",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0xd88d2a9b7254319426595884ca0f719b15e340718c6346031d982e4fe4dcac1a",
+                    "mixHash" : "0x61a7e954c16c14387bb62d76e066ea9e25ac44ef3e7e33af019cdd387c94b603",
+                    "nonce" : "0x0acce8152a9ef011",
                     "number" : "0x01",
                     "parentHash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
-                    "receiptTrie" : "0xd9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885",
-                    "stateRoot" : "0x41832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdade",
+                    "receiptTrie" : "0xf4849c01098c158f7efb57fbc43bfdb51286cbeff826dfefe1c3e70d81836087",
+                    "stateRoot" : "0x93a2d701fa0de14827591c374a2fd55ee6ac021f46aba2c8d1c0dd2d32514777",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdadea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a04c78b389dab64d24b6db9acd2603418640b10607d5c57f26f46b89c8a4eb1316887e4813d93fd7c373f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093a2d701fa0de14827591c374a2fd55ee6ac021f46aba2c8d1c0dd2d32514777a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f4849c01098c158f7efb57fbc43bfdb51286cbeff826dfefe1c3e70d81836087b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a061a7e954c16c14387bb62d76e066ea9e25ac44ef3e7e33af019cdd387c94b603880acce8152a9ef011f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -386,8 +400,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf67a93801e01e46590c735ebd48a216762a802dded7b1ace13faa2f0c96d7b9d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd88d2a9b7254319426595884ca0f719b15e340718c6346031d982e4fe4dcac1a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -400,14 +414,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f8",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7613068",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -431,10 +445,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_gas3000_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_gas3000_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/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -445,19 +459,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c4a",
-                    "hash" : "0xa2cdc35d59c3f40c34dacb25aea702fa1cd8cb5a2d5333efdcf5a1d211ec7a51",
-                    "mixHash" : "0xe91a5684bb47bc6c08c99b8bfbb52579531c472a1d0854682316e3f7d9f035c3",
-                    "nonce" : "0xc9368aeef1acd50d",
+                    "gasUsed" : "0x0148f8",
+                    "hash" : "0xc02d0353acae85ad47be048c083124d4cdc30a7ffe3cfaea9d5c2cba7635054e",
+                    "mixHash" : "0x7e928a166d044eb630d3f6d9dd32d5b63c2334baaf0249bae96d6116f1cf73cd",
+                    "nonce" : "0x9fbbdfd2bcf3b2a6",
                     "number" : "0x01",
                     "parentHash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
-                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
-                    "stateRoot" : "0x0b0849ad032183dc504c288f2a2803b39ea902754c0d3fff75066bc8101a51c2",
+                    "receiptTrie" : "0xd9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885",
+                    "stateRoot" : "0x41832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdade",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b0849ad032183dc504c288f2a2803b39ea902754c0d3fff75066bc8101a51c2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0e91a5684bb47bc6c08c99b8bfbb52579531c472a1d0854682316e3f7d9f035c388c9368aeef1acd50df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdadea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a07e928a166d044eb630d3f6d9dd32d5b63c2334baaf0249bae96d6116f1cf73cd889fbbdfd2bcf3b2a6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -494,16 +508,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2cdc35d59c3f40c34dacb25aea702fa1cd8cb5a2d5333efdcf5a1d211ec7a51",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc02d0353acae85ad47be048c083124d4cdc30a7ffe3cfaea9d5c2cba7635054e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548f8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7613068",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_gas3000_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0148f8",
+                    "hash" : "0x37e9b9578775948756606a82b6665fa7c3ce093663024cac469c08307f17b1fc",
+                    "mixHash" : "0x53020e69d23f0f4239c66b95386ac7ddfaa520d10df6aa23cddbee65a73d0f0b",
+                    "nonce" : "0x4e9542dac67dc191",
+                    "number" : "0x01",
+                    "parentHash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
+                    "receiptTrie" : "0xd9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885",
+                    "stateRoot" : "0x41832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdade",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a01629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041832265a62f0f703fbe982b6f402fafa1d72a8915481fc34565b19ac90fdadea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d9f8121177d5cdb891088201a452d69fd3a5746f4f2b5913c2363a2439d82885b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a053020e69d23f0f4239c66b95386ac7ddfaa520d10df6aa23cddbee65a73d0f0b884e9542dac67dc191f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1629ad8c9bb5616c4da386085b84b0bc929f1adbf590ec8e3ead2e31628e1a8f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f08fd95e9cda59d6eb82e464deaa16cae468b2a254a2e64f3175cdcb3d7fcc3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x37e9b9578775948756606a82b6665fa7c3ce093663024cac469c08307f17b1fc",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155",
@@ -515,14 +630,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c4a",
+                "balance" : "0x4563918244f548f8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d16",
+                "balance" : "0x0de0b6b3a7613068",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0.json
index 9ce3377ed..28b6d68e1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover0_overlappingInputOutput_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c1f",
-                    "hash" : "0xc1315b702c90be0d957e59f64b07960ad63be146235ad6dbdfd2b81bb6147787",
-                    "mixHash" : "0x95af2a029f9cddc89e22009351a67803f46acff9b0d425855486920a8b300edc",
-                    "nonce" : "0xd90c150a8f03dca4",
+                    "gasUsed" : "0x014c47",
+                    "hash" : "0xb818998bf0cbc5f4212f3aa3c0f5e6628629503c95625b3a0bdd6a61a73fd394",
+                    "mixHash" : "0x0e9b2aa877575a3199696af04d1dca5b695fb5dff74d036a0a4d18d065b72dc5",
+                    "nonce" : "0xe9dac054df2b6cec",
                     "number" : "0x01",
                     "parentHash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
-                    "receiptTrie" : "0x03b450c1d4ef6e112358c93b101d1235c58470c4b58d04032c97bd1d70148820",
-                    "stateRoot" : "0x6cafe98f5d9cc7b5e9c37a89db55bf1a8bcf4afe05a876c6159f3b7c96fc546e",
+                    "receiptTrie" : "0xa26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715",
+                    "stateRoot" : "0x0f4bdc3593123d6d0e9969d2ac6f2b4774399dbf8d6dbc7a5678c5999560052d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cafe98f5d9cc7b5e9c37a89db55bf1a8bcf4afe05a876c6159f3b7c96fc546ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba003b450c1d4ef6e112358c93b101d1235c58470c4b58d04032c97bd1d70148820b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c1f8203e880a095af2a029f9cddc89e22009351a67803f46acff9b0d425855486920a8b300edc88d90c150a8f03dca4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f4bdc3593123d6d0e9969d2ac6f2b4774399dbf8d6dbc7a5678c5999560052da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a00e9b2aa877575a3199696af04d1dca5b695fb5dff74d036a0a4d18d065b72dc588e9dac054df2b6cecf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1315b702c90be0d957e59f64b07960ad63be146235ad6dbdfd2b81bb6147787",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb818998bf0cbc5f4212f3aa3c0f5e6628629503c95625b3a0bdd6a61a73fd394",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155",
@@ -76,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c1f",
+                "balance" : "0x4563918244f54c47",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d41",
+                "balance" : "0x0de0b6b3a7612d19",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -107,10 +114,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_overlappingInputOutput_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c47",
-                    "hash" : "0x7293cfb2ac23ed829f8388bb555ff54c9a3209ab12b912c15b9b92962863128d",
-                    "mixHash" : "0xe222c0803e2bb1cc5083d343df2ff9558129727b4f67fa748a09d55d34ed7375",
-                    "nonce" : "0x4b063f9240da3efe",
+                    "hash" : "0x057bd06cb8a45feef449e69c7c7400ac0ee39ce41a3ae16ba5bee2b0602c4a20",
+                    "mixHash" : "0x312c1ef304184fbee3d67860cc22f85c195ba81875f44cf57ee20c23c951a9ae",
+                    "nonce" : "0xe70b039cd72ac64d",
                     "number" : "0x01",
                     "parentHash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
-                    "receiptTrie" : "0x7c9ad3e2e4ab72b3783ff791f21a5cb3eb202c7a1644ded2993a6d3b72894e5c",
-                    "stateRoot" : "0x7de1315f23bc3598bd1a42e5b8b915e327573c0334e1cfb82cb6acc3a86b1292",
+                    "receiptTrie" : "0xa26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715",
+                    "stateRoot" : "0x0f4bdc3593123d6d0e9969d2ac6f2b4774399dbf8d6dbc7a5678c5999560052d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07de1315f23bc3598bd1a42e5b8b915e327573c0334e1cfb82cb6acc3a86b1292a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07c9ad3e2e4ab72b3783ff791f21a5cb3eb202c7a1644ded2993a6d3b72894e5cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a0e222c0803e2bb1cc5083d343df2ff9558129727b4f67fa748a09d55d34ed7375884b063f9240da3efef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f4bdc3593123d6d0e9969d2ac6f2b4774399dbf8d6dbc7a5678c5999560052da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a0312c1ef304184fbee3d67860cc22f85c195ba81875f44cf57ee20c23c951a9ae88e70b039cd72ac64df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -170,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7293cfb2ac23ed829f8388bb555ff54c9a3209ab12b912c15b9b92962863128d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x057bd06cb8a45feef449e69c7c7400ac0ee39ce41a3ae16ba5bee2b0602c4a20",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_overlappingInputOutput_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -229,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f5",
-                    "hash" : "0xf622e9d51a408d6dd8d6051ffa8342cc2856eec31b73ce2a9506343a01c90197",
-                    "mixHash" : "0xc299f2a9dc281f0dc78c6137d7d03f04eda9d72af3524aadd8e5118595166ceb",
-                    "nonce" : "0x484dd2d49de3a143",
+                    "gasUsed" : "0x014c1f",
+                    "hash" : "0x6127f47e2150b6046f2f5c29157c56c6faee4b6b0f43a1c9c5c5ee07ac9fa4c3",
+                    "mixHash" : "0x9059b1f33536162e4e19a5631b8a09084d125489de3dac98cc5d677ca1912279",
+                    "nonce" : "0xa1fc8359223d33c2",
                     "number" : "0x01",
                     "parentHash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
-                    "receiptTrie" : "0xb90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fab",
-                    "stateRoot" : "0x183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eb",
+                    "receiptTrie" : "0x03b450c1d4ef6e112358c93b101d1235c58470c4b58d04032c97bd1d70148820",
+                    "stateRoot" : "0x6cafe98f5d9cc7b5e9c37a89db55bf1a8bcf4afe05a876c6159f3b7c96fc546e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fabb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f58203e880a0c299f2a9dc281f0dc78c6137d7d03f04eda9d72af3524aadd8e5118595166ceb88484dd2d49de3a143f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cafe98f5d9cc7b5e9c37a89db55bf1a8bcf4afe05a876c6159f3b7c96fc546ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba003b450c1d4ef6e112358c93b101d1235c58470c4b58d04032c97bd1d70148820b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c1f8203e880a09059b1f33536162e4e19a5631b8a09084d125489de3dac98cc5d677ca191227988a1fc8359223d33c2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -278,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf622e9d51a408d6dd8d6051ffa8342cc2856eec31b73ce2a9506343a01c90197",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6127f47e2150b6046f2f5c29157c56c6faee4b6b0f43a1c9c5c5ee07ac9fa4c3",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -292,14 +306,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f5",
+                "balance" : "0x4563918244f54c1f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761306b",
+                "balance" : "0x0de0b6b3a7612d41",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -323,10 +337,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_overlappingInputOutput_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -337,19 +351,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f5",
-                    "hash" : "0xc1568a65bfde6113a1cc6a81b633d484f38261d40060f2d65b953b0a70e93129",
-                    "mixHash" : "0x354f5d1ed96f2514b79147dad59675337d21fd47fb48e395bff958ddbfe05b6e",
-                    "nonce" : "0x4284994195775f7b",
+                    "gasUsed" : "0x014c47",
+                    "hash" : "0x136676aa7d4099d4ee9fafc3dd68694f55b275e7ece2226904da7586dda905c6",
+                    "mixHash" : "0x552ce0bc9329bd9b13cade40c0177c4c665eade3be784f1cfff9ad2a1ca99053",
+                    "nonce" : "0x48a9a19c56d4e9c8",
                     "number" : "0x01",
                     "parentHash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
-                    "receiptTrie" : "0xb90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fab",
-                    "stateRoot" : "0x183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eb",
+                    "receiptTrie" : "0x7c9ad3e2e4ab72b3783ff791f21a5cb3eb202c7a1644ded2993a6d3b72894e5c",
+                    "stateRoot" : "0x7de1315f23bc3598bd1a42e5b8b915e327573c0334e1cfb82cb6acc3a86b1292",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fabb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f58203e880a0354f5d1ed96f2514b79147dad59675337d21fd47fb48e395bff958ddbfe05b6e884284994195775f7bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07de1315f23bc3598bd1a42e5b8b915e327573c0334e1cfb82cb6acc3a86b1292a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07c9ad3e2e4ab72b3783ff791f21a5cb3eb202c7a1644ded2993a6d3b72894e5cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a0552ce0bc9329bd9b13cade40c0177c4c665eade3be784f1cfff9ad2a1ca990538848a9a19c56d4e9c8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -386,8 +400,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1568a65bfde6113a1cc6a81b633d484f38261d40060f2d65b953b0a70e93129",
-        "network" : "Homestead",
+        "lastblockhash" : "0x136676aa7d4099d4ee9fafc3dd68694f55b275e7ece2226904da7586dda905c6",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -400,14 +414,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f5",
+                "balance" : "0x4563918244f54c47",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761306b",
+                "balance" : "0x0de0b6b3a7612d19",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -431,10 +445,10 @@
             }
         }
     },
-    "CALLCODEEcrecover0_overlappingInputOutput_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -445,19 +459,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c47",
-                    "hash" : "0x36f5bf27a69be0c5b92563080f5dab53f6205a18f53d49591e4f2a403a498958",
-                    "mixHash" : "0x27c136ffc4afdb0af84b2b8a434a4f12213ab0931d8005fe2f21bf436d7d4156",
-                    "nonce" : "0x6fd1ec3aa1465ac9",
+                    "gasUsed" : "0x0148f5",
+                    "hash" : "0x35ffa9fb2bd67cbe2fd1519b6b61ac76db32658df0ec0a2d03138175421ae769",
+                    "mixHash" : "0x96c3f495ca07c418ed34a5a8f599e82b70ccf5cc2790b89e87e0e937ccb41b26",
+                    "nonce" : "0x5e7fcf703b6bb996",
                     "number" : "0x01",
                     "parentHash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
-                    "receiptTrie" : "0xa26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715",
-                    "stateRoot" : "0x0f4bdc3593123d6d0e9969d2ac6f2b4774399dbf8d6dbc7a5678c5999560052d",
+                    "receiptTrie" : "0xb90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fab",
+                    "stateRoot" : "0x183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f4bdc3593123d6d0e9969d2ac6f2b4774399dbf8d6dbc7a5678c5999560052da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a027c136ffc4afdb0af84b2b8a434a4f12213ab0931d8005fe2f21bf436d7d4156886fd1ec3aa1465ac9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fabb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f58203e880a096c3f495ca07c418ed34a5a8f599e82b70ccf5cc2790b89e87e0e937ccb41b26885e7fcf703b6bb996f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -494,16 +508,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36f5bf27a69be0c5b92563080f5dab53f6205a18f53d49591e4f2a403a498958",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x35ffa9fb2bd67cbe2fd1519b6b61ac76db32658df0ec0a2d03138175421ae769",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548f5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761306b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover0_overlappingInputOutput_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0148f5",
+                    "hash" : "0x1c41800456eb6cb5daf99c6499c12728131541505c7dbe129a437f49f59b87d5",
+                    "mixHash" : "0x25b38ab615694bc02a97a099dffef34e26268fb3f2fc521206301e997a3caea9",
+                    "nonce" : "0x01bf4782a23cc6f7",
+                    "number" : "0x01",
+                    "parentHash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
+                    "receiptTrie" : "0xb90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fab",
+                    "stateRoot" : "0x183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0accbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0183e13495fa64d9ccd797a9a8697d0f22eeea6c342a430f71844259260e924eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b90f590bb7389e607913053df04091f4c0148d5b7c25ad64175f22906aba1fabb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f58203e880a025b38ab615694bc02a97a099dffef34e26268fb3f2fc521206301e997a3caea98801bf4782a23cc6f7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xaccbd8b69e05ea69d1a50becd2e83d5b30c5e61784c4267c8ad355edae7dfae0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00df5263af2e66bc0ac74e967ec45e632d5f7802c90a735279e41c563ed1e4a40a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1c41800456eb6cb5daf99c6499c12728131541505c7dbe129a437f49f59b87d5",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155",
@@ -515,14 +630,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c47",
+                "balance" : "0x4563918244f548f5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d19",
+                "balance" : "0x0de0b6b3a761306b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0.json
index 3a6bff8db..fc3b58dc5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover1_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover1_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/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd6f2",
-                    "hash" : "0xcda41f205daf7c0a584a6230862eb8f50699a8b5f4da22f6d7efe3ac70e0769c",
-                    "mixHash" : "0xb2af0a80a877459221fe6cf70617dcef99af10894ba8a11451587277166d4a41",
-                    "nonce" : "0xa27262d2eafb6e96",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x5f97390c46bdcb3c2b2d1de2cadb750dee3b0ee084cba1f03bf1904f32e7177a",
+                    "mixHash" : "0x96388a87d133b3c9a9245c8a259f1d82d816fed1ee13a4cb2eec0628e554c9f9",
+                    "nonce" : "0xffdb15684f8b34ab",
                     "number" : "0x01",
                     "parentHash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
-                    "receiptTrie" : "0xcb11732fe9b9b6f1376dc1c3c4676b476454ababfb5cc4611bcc999173298bff",
-                    "stateRoot" : "0x99917c14b765ef56ee1e1a5fcd8b46dd4a494405519398f3e2930324a1efe4e7",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0xc3204a4ddb6d80117502d1d24dd3c5fde1cad22256616d7b4b0d0e2c98a7dad8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099917c14b765ef56ee1e1a5fcd8b46dd4a494405519398f3e2930324a1efe4e7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cb11732fe9b9b6f1376dc1c3c4676b476454ababfb5cc4611bcc999173298bffb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a0b2af0a80a877459221fe6cf70617dcef99af10894ba8a11451587277166d4a4188a27262d2eafb6e96f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c3204a4ddb6d80117502d1d24dd3c5fde1cad22256616d7b4b0d0e2c98a7dad8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a096388a87d133b3c9a9245c8a259f1d82d816fed1ee13a4cb2eec0628e554c9f988ffdb15684f8b34abf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcda41f205daf7c0a584a6230862eb8f50699a8b5f4da22f6d7efe3ac70e0769c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5f97390c46bdcb3c2b2d1de2cadb750dee3b0ee084cba1f03bf1904f32e7177a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d6f2",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a26e",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecover1_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover1_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/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0xdded6b5b5150ed8ce23c5edd907d6fdd03673e5c9ec1eaeadf988fa7082a7464",
-                    "mixHash" : "0x08ba7caa8997ed5b61f720d9d70c884640191a9ba9ff19c9a613d9c6d321d480",
-                    "nonce" : "0x2d136c2ce282b12d",
+                    "hash" : "0xdff57ea0881d30d1c28d12841b7019c1900cd168e272abfbeb630e88cf26f5b2",
+                    "mixHash" : "0x6e04787b7c43d5fad528319cc24087f8e3df9a49e31d4c4b6b1b829d2d2117da",
+                    "nonce" : "0xb6a7e93f6d280200",
                     "number" : "0x01",
                     "parentHash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
-                    "receiptTrie" : "0x438dad602ff07937130420e27bf649f2c7eaac5468b42cbeab69d37e4ae31337",
-                    "stateRoot" : "0xb909b36cad8c28f66039b9755575e369a14e00dedf5f2bf8ad3c6b495b10db9c",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0xc3204a4ddb6d80117502d1d24dd3c5fde1cad22256616d7b4b0d0e2c98a7dad8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b909b36cad8c28f66039b9755575e369a14e00dedf5f2bf8ad3c6b495b10db9ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0438dad602ff07937130420e27bf649f2c7eaac5468b42cbeab69d37e4ae31337b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a008ba7caa8997ed5b61f720d9d70c884640191a9ba9ff19c9a613d9c6d321d480882d136c2ce282b12df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c3204a4ddb6d80117502d1d24dd3c5fde1cad22256616d7b4b0d0e2c98a7dad8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a06e04787b7c43d5fad528319cc24087f8e3df9a49e31d4c4b6b1b829d2d2117da88b6a7e93f6d280200f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdded6b5b5150ed8ce23c5edd907d6fdd03673e5c9ec1eaeadf988fa7082a7464",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdff57ea0881d30d1c28d12841b7019c1900cd168e272abfbeb630e88cf26f5b2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecover1_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover1_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/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0xe2046a2079fe021f411ecaa5ed98c6f4bc2043a6383c0872333a020a5b9d2666",
-                    "mixHash" : "0xf5dbbc8cd8ed0c452c9521a5fa69f553546dae8f908f017564f5fa7952c7de88",
-                    "nonce" : "0x05fdfaf206629a71",
+                    "gasUsed" : "0xd6f2",
+                    "hash" : "0x617dc55d2f1aa24fbc20cc2525c1a5b2de022f702fd2c84ba61387f4dab227fc",
+                    "mixHash" : "0x8dea3fd400c1f6ef128b47606b4f3493159009620d6238a4ebabe18f6de8d047",
+                    "nonce" : "0xe71cee45a8c53b60",
                     "number" : "0x01",
                     "parentHash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
-                    "receiptTrie" : "0x6973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944",
-                    "stateRoot" : "0x68ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3",
+                    "receiptTrie" : "0xcb11732fe9b9b6f1376dc1c3c4676b476454ababfb5cc4611bcc999173298bff",
+                    "stateRoot" : "0x99917c14b765ef56ee1e1a5fcd8b46dd4a494405519398f3e2930324a1efe4e7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0f5dbbc8cd8ed0c452c9521a5fa69f553546dae8f908f017564f5fa7952c7de888805fdfaf206629a71f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099917c14b765ef56ee1e1a5fcd8b46dd4a494405519398f3e2930324a1efe4e7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cb11732fe9b9b6f1376dc1c3c4676b476454ababfb5cc4611bcc999173298bffb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a08dea3fd400c1f6ef128b47606b4f3493159009620d6238a4ebabe18f6de8d04788e71cee45a8c53b60f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2046a2079fe021f411ecaa5ed98c6f4bc2043a6383c0872333a020a5b9d2666",
-        "network" : "Frontier",
+        "lastblockhash" : "0x617dc55d2f1aa24fbc20cc2525c1a5b2de022f702fd2c84ba61387f4dab227fc",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d6f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a26e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecover1_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover1_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/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0xa3a368dca7a7a7eed0c96fbffd269a2ecfc04ede4930e6f4fb7b6c779cbdf872",
-                    "mixHash" : "0x972ae124c30642633c7f03f59ff386ce4cdf7a74e8eff012f500b27f42e178c0",
-                    "nonce" : "0xfa267e34c214b2c2",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0xfbc5811f36a6de215e7c9dfe4ef6abe9dd495d8d6babacd47c69764167e6f49e",
+                    "mixHash" : "0x6c4a000b0c2520fb7a7d6dced0e1c6eb2578b9c6e053451b606c5b148b0df43a",
+                    "nonce" : "0x0a8abac2975c96f9",
                     "number" : "0x01",
                     "parentHash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
-                    "receiptTrie" : "0x6973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944",
-                    "stateRoot" : "0x68ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3",
+                    "receiptTrie" : "0x438dad602ff07937130420e27bf649f2c7eaac5468b42cbeab69d37e4ae31337",
+                    "stateRoot" : "0xb909b36cad8c28f66039b9755575e369a14e00dedf5f2bf8ad3c6b495b10db9c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0972ae124c30642633c7f03f59ff386ce4cdf7a74e8eff012f500b27f42e178c088fa267e34c214b2c2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b909b36cad8c28f66039b9755575e369a14e00dedf5f2bf8ad3c6b495b10db9ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0438dad602ff07937130420e27bf649f2c7eaac5468b42cbeab69d37e4ae31337b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a06c4a000b0c2520fb7a7d6dced0e1c6eb2578b9c6e053451b606c5b148b0df43a880a8abac2975c96f9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3a368dca7a7a7eed0c96fbffd269a2ecfc04ede4930e6f4fb7b6c779cbdf872",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfbc5811f36a6de215e7c9dfe4ef6abe9dd495d8d6babacd47c69764167e6f49e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecover1_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover1_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/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0x0b87fb2039f0c4f7c31793abc08bf461f82b661d76ba84a0ccf11f722bc38958",
-                    "mixHash" : "0xeac766821035dec171bc542849c619b42569f81778112b7b4406e7d3f386bb71",
-                    "nonce" : "0xdbb07553ae6b31e6",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0x2cf514c87547e86269f40867b529834eacfc7ed8487484995df75b0c766c6eb0",
+                    "mixHash" : "0x91b35542ab6855b960393f031f7e3cdd139cb4f156f7c5ac124737a470c08349",
+                    "nonce" : "0xbb31cc92f10e5a73",
                     "number" : "0x01",
                     "parentHash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0xc3204a4ddb6d80117502d1d24dd3c5fde1cad22256616d7b4b0d0e2c98a7dad8",
+                    "receiptTrie" : "0x6973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944",
+                    "stateRoot" : "0x68ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c3204a4ddb6d80117502d1d24dd3c5fde1cad22256616d7b4b0d0e2c98a7dad8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0eac766821035dec171bc542849c619b42569f81778112b7b4406e7d3f386bb7188dbb07553ae6b31e6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a091b35542ab6855b960393f031f7e3cdd139cb4f156f7c5ac124737a470c0834988bb31cc92f10e5a73f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b87fb2039f0c4f7c31793abc08bf461f82b661d76ba84a0ccf11f722bc38958",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2cf514c87547e86269f40867b529834eacfc7ed8487484995df75b0c766c6eb0",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a598",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0xdc706addb866bbcfa22a8ea26182233a08406beb0b112432a043f2c073b153fd",
+                    "mixHash" : "0x72fc6100fa5d16cbb123c55b3053b505b55fc90cb02aa4dba393f925bf91eca9",
+                    "nonce" : "0x6441bd968a755a7c",
+                    "number" : "0x01",
+                    "parentHash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
+                    "receiptTrie" : "0x6973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944",
+                    "stateRoot" : "0x68ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ba2279bfa51c7835babf83ffa060eb34cbd001e07f030e617929e8d10817e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06973c11609eec5424110f8301b776f6cc71b9b4007f73a4d59efcf1a92c80944b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a072fc6100fa5d16cbb123c55b3053b505b55fc90cb02aa4dba393f925bf91eca9886441bd968a755a7cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x314b9758ca99bb6b4872f1df643f7dd39f4ec305264ae92831606c2a9ee6efec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x07b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007b63f082b752d1b968b9b30e7c1fe64494717cf6507df9b4537b775239af978a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc706addb866bbcfa22a8ea26182233a08406beb0b112432a043f2c073b153fd",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a761a598",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0.json
index fab7018fa..172053080 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover2_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover2_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/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd6f2",
-                    "hash" : "0x4d7572a940362b4ba1efa58a4b4c39d45fba38667fa485bafef99754ef1e239a",
-                    "mixHash" : "0xfd55b267e2cb611f11f2da7037c264c9f2fb26653cf8e40efed8735508c14a0d",
-                    "nonce" : "0x2167d2b0cebcf0f9",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x07ef7507894de2e377a2dd9a4c64ec4ec13aa928f711290e11d429f6a3bf8f0e",
+                    "mixHash" : "0x4d8c724056f0a9a525702342cfe0ee475ea700633f3da8d31c7a31d97feccdf4",
+                    "nonce" : "0xfbdbcb08e138ee91",
                     "number" : "0x01",
                     "parentHash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
-                    "receiptTrie" : "0x9510c5f557d71ffaa2212a77d28f8315b4f35df15e3ad3dd8569777b87fa0e73",
-                    "stateRoot" : "0x9b0c8892c91ac8a7db090e9032377476fb2ac8f436ff8f05178ce4762ace64b8",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0xe5c916900c1b4bed4a778652fe4de721220f246b132b6c2952622452559dea5d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b0c8892c91ac8a7db090e9032377476fb2ac8f436ff8f05178ce4762ace64b8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba09510c5f557d71ffaa2212a77d28f8315b4f35df15e3ad3dd8569777b87fa0e73b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a0fd55b267e2cb611f11f2da7037c264c9f2fb26653cf8e40efed8735508c14a0d882167d2b0cebcf0f9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c916900c1b4bed4a778652fe4de721220f246b132b6c2952622452559dea5da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a04d8c724056f0a9a525702342cfe0ee475ea700633f3da8d31c7a31d97feccdf488fbdbcb08e138ee91f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d7572a940362b4ba1efa58a4b4c39d45fba38667fa485bafef99754ef1e239a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x07ef7507894de2e377a2dd9a4c64ec4ec13aa928f711290e11d429f6a3bf8f0e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d6f2",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a26e",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecover2_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover2_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/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x7a7ccc19bcf87157d895350fc5eba6746e7e0cb7e39323e2e62fdaae5ea710cd",
-                    "mixHash" : "0x4c26b40feeccbdc90844c78a23da0904fd351c848d008c9253ef3be717378484",
-                    "nonce" : "0xe2179326e29dd569",
+                    "hash" : "0x73cdb962c35a8b0f8c85ea5c96716acbbbfbad3cb087d282868c89b2b5d087ab",
+                    "mixHash" : "0x0d333c08095a64ce0d46d554fe756604727db0ef48e9dc013aa799284f722103",
+                    "nonce" : "0xc61684bad41f5eef",
                     "number" : "0x01",
                     "parentHash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
-                    "receiptTrie" : "0xda14a55a4ea7734f70971b97bc459a8250e341b7de927d6b5324cb3cfff1886f",
-                    "stateRoot" : "0xf8d199f7157ca6397237f130fe0c8ea966a76708c38c992bcae98b65be476894",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0xe5c916900c1b4bed4a778652fe4de721220f246b132b6c2952622452559dea5d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8d199f7157ca6397237f130fe0c8ea966a76708c38c992bcae98b65be476894a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0da14a55a4ea7734f70971b97bc459a8250e341b7de927d6b5324cb3cfff1886fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a04c26b40feeccbdc90844c78a23da0904fd351c848d008c9253ef3be71737848488e2179326e29dd569f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c916900c1b4bed4a778652fe4de721220f246b132b6c2952622452559dea5da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a00d333c08095a64ce0d46d554fe756604727db0ef48e9dc013aa799284f72210388c61684bad41f5eeff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a7ccc19bcf87157d895350fc5eba6746e7e0cb7e39323e2e62fdaae5ea710cd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x73cdb962c35a8b0f8c85ea5c96716acbbbfbad3cb087d282868c89b2b5d087ab",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecover2_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover2_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/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0xd7a42c8d887472e58b6f636316ce135118b7e665c0a963600077fddd4c81237c",
-                    "mixHash" : "0x995c84a8191a13a5ce6ac23cc9de4bf3272773362871e023e727afffbfe655ba",
-                    "nonce" : "0x5902097dd8131bc1",
+                    "gasUsed" : "0xd6f2",
+                    "hash" : "0x046d33bb8c2519f5ddb0b2892bc09439931da50699221868e29cf0705a588299",
+                    "mixHash" : "0xa3ab7f70dd6e9b964d4cf41263a88ac14f46189e74b684402d6bd8de07338abd",
+                    "nonce" : "0x1cade7823a28cb3f",
                     "number" : "0x01",
                     "parentHash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
-                    "receiptTrie" : "0xf18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05",
-                    "stateRoot" : "0xfe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456",
+                    "receiptTrie" : "0x9510c5f557d71ffaa2212a77d28f8315b4f35df15e3ad3dd8569777b87fa0e73",
+                    "stateRoot" : "0x9b0c8892c91ac8a7db090e9032377476fb2ac8f436ff8f05178ce4762ace64b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0995c84a8191a13a5ce6ac23cc9de4bf3272773362871e023e727afffbfe655ba885902097dd8131bc1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b0c8892c91ac8a7db090e9032377476fb2ac8f436ff8f05178ce4762ace64b8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba09510c5f557d71ffaa2212a77d28f8315b4f35df15e3ad3dd8569777b87fa0e73b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a0a3ab7f70dd6e9b964d4cf41263a88ac14f46189e74b684402d6bd8de07338abd881cade7823a28cb3ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7a42c8d887472e58b6f636316ce135118b7e665c0a963600077fddd4c81237c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x046d33bb8c2519f5ddb0b2892bc09439931da50699221868e29cf0705a588299",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d6f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a26e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecover2_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover2_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/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0x779527623ccc08cbf2b008a06b9ca3aced1f4c0dd93f33d8b04a6169efab771d",
-                    "mixHash" : "0xe02eedc1d5d4d0657c1576710f5110d72912a7a444e2ef31ac100cc2f8e8d315",
-                    "nonce" : "0x4292d02b9fb95a2c",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0xbd769ebc7d594d32cc33a336ce295bb22a63120f0f97c7d848f3f5862b58e4db",
+                    "mixHash" : "0x1804d82f28a08469196c0668159724f4e4da42292ae06fddc452c7a44f8ba7fc",
+                    "nonce" : "0xb49e21f0ed34df5a",
                     "number" : "0x01",
                     "parentHash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
-                    "receiptTrie" : "0xf18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05",
-                    "stateRoot" : "0xfe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456",
+                    "receiptTrie" : "0xda14a55a4ea7734f70971b97bc459a8250e341b7de927d6b5324cb3cfff1886f",
+                    "stateRoot" : "0xf8d199f7157ca6397237f130fe0c8ea966a76708c38c992bcae98b65be476894",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0e02eedc1d5d4d0657c1576710f5110d72912a7a444e2ef31ac100cc2f8e8d315884292d02b9fb95a2cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8d199f7157ca6397237f130fe0c8ea966a76708c38c992bcae98b65be476894a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0da14a55a4ea7734f70971b97bc459a8250e341b7de927d6b5324cb3cfff1886fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a01804d82f28a08469196c0668159724f4e4da42292ae06fddc452c7a44f8ba7fc88b49e21f0ed34df5af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x779527623ccc08cbf2b008a06b9ca3aced1f4c0dd93f33d8b04a6169efab771d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbd769ebc7d594d32cc33a336ce295bb22a63120f0f97c7d848f3f5862b58e4db",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecover2_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover2_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/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0xd2fbfb8ae51f357f3a3a537f94a1ba03ee097cb8434a5c339b67d24c640b1a87",
-                    "mixHash" : "0x6643b2bfebf3c06e72693be99c940dd84d022afee17aeac6140c2d204bc79161",
-                    "nonce" : "0xcc884db4040895aa",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0x293e028db5ecd77ed8602bf1a79eaa2d5661a34980a1a68710078776fcbda66a",
+                    "mixHash" : "0xbfcc04f31dd410e829d4087008d013be9258ea2b87ca6935a1c81a03d54a3a75",
+                    "nonce" : "0xbba656d8d680d84c",
                     "number" : "0x01",
                     "parentHash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0xe5c916900c1b4bed4a778652fe4de721220f246b132b6c2952622452559dea5d",
+                    "receiptTrie" : "0xf18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05",
+                    "stateRoot" : "0xfe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c916900c1b4bed4a778652fe4de721220f246b132b6c2952622452559dea5da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a06643b2bfebf3c06e72693be99c940dd84d022afee17aeac6140c2d204bc7916188cc884db4040895aaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0bfcc04f31dd410e829d4087008d013be9258ea2b87ca6935a1c81a03d54a3a7588bba656d8d680d84cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2fbfb8ae51f357f3a3a537f94a1ba03ee097cb8434a5c339b67d24c640b1a87",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x293e028db5ecd77ed8602bf1a79eaa2d5661a34980a1a68710078776fcbda66a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a598",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0xd2aff8f7fbdf359d6137d2d7c413031cab05c5de4e40443b2d2d5efdbec0f935",
+                    "mixHash" : "0x0750aa8fef7794ca8d9b51ffc5175ad6234e81333399e6c10ddda9853c90e4c9",
+                    "nonce" : "0xd58419fc478b6963",
+                    "number" : "0x01",
+                    "parentHash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
+                    "receiptTrie" : "0xf18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05",
+                    "stateRoot" : "0xfe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a02fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe125b2ddb9630ff021cad7ecc95d31405cb130a4c2c5c454d97194244b59456a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f18f3b2ea98bc617059ab16415bc430f858ba789ed86c536252b340b35a40f05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a00750aa8fef7794ca8d9b51ffc5175ad6234e81333399e6c10ddda9853c90e4c988d58419fc478b6963f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2fec868d893970272827f8b0815aa0b3d3535abe04054f58814ed0bdf090e39d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0353849497b240c1aa9c5cb624acce577fcfd47f8b823652464d0fbe2361b980ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd2aff8f7fbdf359d6137d2d7c413031cab05c5de4e40443b2d2d5efdbec0f935",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a761a598",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0.json
index e3fce9173..709f53b5c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover3_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover3_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/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01118a",
-                    "hash" : "0xf1f2c33702f431b4d18e2c22b38d860f9d814b4da6fedeafee4250db3b726ac1",
-                    "mixHash" : "0x854bbbe8f30c09ba32d77b210f8ac69f266ac672a465784f1b077c43b4a941e9",
-                    "nonce" : "0x7b0195eabde686aa",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x1a7b8d7854a1bef92eeb94033591592a68867a0311a709a4b4c4f08ef1c17f5a",
+                    "mixHash" : "0x43a6088d48111dfc37c2cfc36eaea9226125856d25ad2dc97d0104aa42e1accf",
+                    "nonce" : "0x2e241fd9e0ab4eb9",
                     "number" : "0x01",
                     "parentHash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
-                    "receiptTrie" : "0x41b7dedaf599b31141eb881357b507a3959553037cf0ee091457fb4ec17f3af3",
-                    "stateRoot" : "0xb03a011e0b963354241df92dbf7cab230212297539d8735b468b60d0ce531fbc",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x67154169abf3e7d6653bc0e42c4fe98d610db9d0a1b4f37c7efb2cf6e1d28a96",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b03a011e0b963354241df92dbf7cab230212297539d8735b468b60d0ce531fbca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba041b7dedaf599b31141eb881357b507a3959553037cf0ee091457fb4ec17f3af3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301118a8203e880a0854bbbe8f30c09ba32d77b210f8ac69f266ac672a465784f1b077c43b4a941e9887b0195eabde686aaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067154169abf3e7d6653bc0e42c4fe98d610db9d0a1b4f37c7efb2cf6e1d28a96a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a043a6088d48111dfc37c2cfc36eaea9226125856d25ad2dc97d0104aa42e1accf882e241fd9e0ab4eb9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1f2c33702f431b4d18e2c22b38d860f9d814b4da6fedeafee4250db3b726ac1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1a7b8d7854a1bef92eeb94033591592a68867a0311a709a4b4c4f08ef1c17f5a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
@@ -75,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5118a",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167d6",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -106,10 +113,10 @@
             }
         }
     },
-    "CALLCODEEcrecover3_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover3_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/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0111b2",
-                    "hash" : "0xffae4848e46fa192cd3408a924f28131b35377258bd7d2f8c704a18f3a8c1a25",
-                    "mixHash" : "0xe7dd9b947ff05ccda8c11aa836882b7319fc79a19032b433bfee9e84e1500f7d",
-                    "nonce" : "0x8039b40f8e58ab56",
+                    "hash" : "0xe642768e93ba61bdd0f1d88af08db2312245a3c9d63dfa8d16a7be131cb14374",
+                    "mixHash" : "0x1ee8f5efa8c826216819e8f16709f9c2c2dcd2ece0d0156708e462fd967455fd",
+                    "nonce" : "0xa63384f0558f4ef8",
                     "number" : "0x01",
                     "parentHash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
-                    "receiptTrie" : "0xe8849c72b0d22afcfaad43a385f5c1dbcd05dff760f6d38c99ec2da1e4db76f0",
-                    "stateRoot" : "0x21fe2a795b9ea48e5e892f7fe0852f79b8bf25bcc34a12dee610d55ccbf18c90",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x67154169abf3e7d6653bc0e42c4fe98d610db9d0a1b4f37c7efb2cf6e1d28a96",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021fe2a795b9ea48e5e892f7fe0852f79b8bf25bcc34a12dee610d55ccbf18c90a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e8849c72b0d22afcfaad43a385f5c1dbcd05dff760f6d38c99ec2da1e4db76f0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0e7dd9b947ff05ccda8c11aa836882b7319fc79a19032b433bfee9e84e1500f7d888039b40f8e58ab56f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067154169abf3e7d6653bc0e42c4fe98d610db9d0a1b4f37c7efb2cf6e1d28a96a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a01ee8f5efa8c826216819e8f16709f9c2c2dcd2ece0d0156708e462fd967455fd88a63384f0558f4ef8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffae4848e46fa192cd3408a924f28131b35377258bd7d2f8c704a18f3a8c1a25",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe642768e93ba61bdd0f1d88af08db2312245a3c9d63dfa8d16a7be131cb14374",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "CALLCODEEcrecover3_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover3_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/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010e60",
-                    "hash" : "0x29cd0b68d97e91d9a7e161e186284f821d15e464013632b7d32c76fa17f43b4f",
-                    "mixHash" : "0x3a3df6b390744dc7ed6991154824f2f825574bf6f224c54807ea46a14561eb8c",
-                    "nonce" : "0x990cf403bb8efa48",
+                    "gasUsed" : "0x01118a",
+                    "hash" : "0x0a94d2c64147ea1fc723311d99882a20037467af7d8de0be6809fba2102d158a",
+                    "mixHash" : "0x288fcc6058068cc8baa5e9b51dcdef0c8643315496204241de56add41d92e221",
+                    "nonce" : "0xb7d8b60ded33c6f7",
                     "number" : "0x01",
                     "parentHash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
-                    "receiptTrie" : "0x7c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3",
-                    "stateRoot" : "0xe587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fb",
+                    "receiptTrie" : "0x41b7dedaf599b31141eb881357b507a3959553037cf0ee091457fb4ec17f3af3",
+                    "stateRoot" : "0xb03a011e0b963354241df92dbf7cab230212297539d8735b468b60d0ce531fbc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a03a3df6b390744dc7ed6991154824f2f825574bf6f224c54807ea46a14561eb8c88990cf403bb8efa48f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b03a011e0b963354241df92dbf7cab230212297539d8735b468b60d0ce531fbca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba041b7dedaf599b31141eb881357b507a3959553037cf0ee091457fb4ec17f3af3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301118a8203e880a0288fcc6058068cc8baa5e9b51dcdef0c8643315496204241de56add41d92e22188b7d8b60ded33c6f7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29cd0b68d97e91d9a7e161e186284f821d15e464013632b7d32c76fa17f43b4f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0a94d2c64147ea1fc723311d99882a20037467af7d8de0be6809fba2102d158a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +303,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50e60",
+                "balance" : "0x4563918244f5118a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b00",
+                "balance" : "0x0de0b6b3a76167d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +334,10 @@
             }
         }
     },
-    "CALLCODEEcrecover3_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover3_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/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010e60",
-                    "hash" : "0xfdafb6a37ed4cdb55df53b7d29410ae06611eb094cc5a506b6559bb87a8121a9",
-                    "mixHash" : "0x46b0664e20a8262c2847bbf0b5d4aee03a2633831495e95334604ea6829cd893",
-                    "nonce" : "0x87d6b418be291106",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x97f719d990313e9feadc13bc3960e5dedc7d8f85613add64d3fd08f47d0acb1e",
+                    "mixHash" : "0xcc3286b47cba9614c6cfa412f417602046b7496798730c0f8456cb8ee01da964",
+                    "nonce" : "0x681cb208001b4c03",
                     "number" : "0x01",
                     "parentHash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
-                    "receiptTrie" : "0x7c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3",
-                    "stateRoot" : "0xe587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fb",
+                    "receiptTrie" : "0xe8849c72b0d22afcfaad43a385f5c1dbcd05dff760f6d38c99ec2da1e4db76f0",
+                    "stateRoot" : "0x21fe2a795b9ea48e5e892f7fe0852f79b8bf25bcc34a12dee610d55ccbf18c90",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a046b0664e20a8262c2847bbf0b5d4aee03a2633831495e95334604ea6829cd8938887d6b418be291106f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021fe2a795b9ea48e5e892f7fe0852f79b8bf25bcc34a12dee610d55ccbf18c90a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e8849c72b0d22afcfaad43a385f5c1dbcd05dff760f6d38c99ec2da1e4db76f0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0cc3286b47cba9614c6cfa412f417602046b7496798730c0f8456cb8ee01da96488681cb208001b4c03f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdafb6a37ed4cdb55df53b7d29410ae06611eb094cc5a506b6559bb87a8121a9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x97f719d990313e9feadc13bc3960e5dedc7d8f85613add64d3fd08f47d0acb1e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -396,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50e60",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b00",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -427,10 +441,10 @@
             }
         }
     },
-    "CALLCODEEcrecover3_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover3_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/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +455,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0111b2",
-                    "hash" : "0x8691e5fee1123e52f613d4cdc08e537fd140e661e73710cff7cc584441f9ad70",
-                    "mixHash" : "0xb593ab7f354fded133e3cd094010bd83b64551505bc9e639888b9d8287320b84",
-                    "nonce" : "0x3451c69101a5d89f",
+                    "gasUsed" : "0x010e60",
+                    "hash" : "0xf97cf06af2f7516b815604e18683a4068bacbacf3dd95466857ffb431f6412b0",
+                    "mixHash" : "0xf044a5518944a238aa35ae8006aa9f9016f9b48a35d6aa9b4c3d8888ed1110fd",
+                    "nonce" : "0x381e9c360c63fb88",
                     "number" : "0x01",
                     "parentHash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
-                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
-                    "stateRoot" : "0x67154169abf3e7d6653bc0e42c4fe98d610db9d0a1b4f37c7efb2cf6e1d28a96",
+                    "receiptTrie" : "0x7c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3",
+                    "stateRoot" : "0xe587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067154169abf3e7d6653bc0e42c4fe98d610db9d0a1b4f37c7efb2cf6e1d28a96a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0b593ab7f354fded133e3cd094010bd83b64551505bc9e639888b9d8287320b84883451c69101a5d89ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a0f044a5518944a238aa35ae8006aa9f9016f9b48a35d6aa9b4c3d8888ed1110fd88381e9c360c63fb88f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8691e5fee1123e52f613d4cdc08e537fd140e661e73710cff7cc584441f9ad70",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf97cf06af2f7516b815604e18683a4068bacbacf3dd95466857ffb431f6412b0",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xe4319f4b631c6d0fcfc84045dbcb676865fe5e13",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50e60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616b00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x010e60",
+                    "hash" : "0xc188a1969c22d1a74c87389bdff228deb3260b842cfb979d331870e38539ad8d",
+                    "mixHash" : "0xef7b8212e79e6f46489fbeca3470d4e6030f335440a62f2df6cf8e5d91f4d971",
+                    "nonce" : "0xdb9f7cc2cf237586",
+                    "number" : "0x01",
+                    "parentHash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
+                    "receiptTrie" : "0x7c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3",
+                    "stateRoot" : "0xe587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a056ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e587e0e36069b7927d21b115338015b903902efa2723b71661edea1e7761f3fba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07c05aeb80321329836d3fd44ded3e5bdc085140e8838c7fe1a47127f56b296c3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a0ef7b8212e79e6f46489fbeca3470d4e6030f335440a62f2df6cf8e5d91f4d97188db9f7cc2cf237586f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x56ff2292f6a978fa827964cbab0bb378d4ea517a47381fbdf9c1a4c630cc4476",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a4f368a566131971e0849969e89f4f3aac7ef2cab8fb140cfd7b1a7b235d301a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc188a1969c22d1a74c87389bdff228deb3260b842cfb979d331870e38539ad8d",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f511b2",
+                "balance" : "0x4563918244f50e60",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167ae",
+                "balance" : "0x0de0b6b3a7616b00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0.json
index 532f22a48..c6623a5a9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecover80_d0g0v0_EIP150" : {
+    "CALLCODEEcrecover80_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/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd6f2",
-                    "hash" : "0x2bfa244f866e615eb0b7b21406f3896a84f2a6c72e566e58c4010bfe18e6beb8",
-                    "mixHash" : "0xac7d992860363d8fe6f44490cb18d8b440ef67d13bc30e9d3656ac3b92be1649",
-                    "nonce" : "0x4e4ceed73c620e86",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x78fc7155bed83a72686b2793d97b7a3dc662a89cf4d4410fed7e11d0ae0b5bc4",
+                    "mixHash" : "0x076515ed35899b4106170445c6b69c278fff34af56036507292e32b8b2ea4194",
+                    "nonce" : "0xe530878031880132",
                     "number" : "0x01",
                     "parentHash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
-                    "receiptTrie" : "0xc14f0356f34b3ac21bfdcbbe461e26b54c2053e0c971df67dfc70500f61d0945",
-                    "stateRoot" : "0xde9ee0970d199ec7dbba34807338aa3092739d2e432a4d6b200ba8cb632ceeee",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x1113b01f3a94180fe0b08902aab7d8aa0b4546affa9188f6f41a4c2c81b32608",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de9ee0970d199ec7dbba34807338aa3092739d2e432a4d6b200ba8cb632ceeeea0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c14f0356f34b3ac21bfdcbbe461e26b54c2053e0c971df67dfc70500f61d0945b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a0ac7d992860363d8fe6f44490cb18d8b440ef67d13bc30e9d3656ac3b92be1649884e4ceed73c620e86f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01113b01f3a94180fe0b08902aab7d8aa0b4546affa9188f6f41a4c2c81b32608a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0076515ed35899b4106170445c6b69c278fff34af56036507292e32b8b2ea419488e530878031880132f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bfa244f866e615eb0b7b21406f3896a84f2a6c72e566e58c4010bfe18e6beb8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x78fc7155bed83a72686b2793d97b7a3dc662a89cf4d4410fed7e11d0ae0b5bc4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d6f2",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a26e",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecover80_d0g0v0_EIP158" : {
+    "CALLCODEEcrecover80_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/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x0dce79bdef06863817c9b81d4f1cf5130425106a06f37ec9146d621e61683af0",
-                    "mixHash" : "0xa34152aa5d00e7b0772d8dde00425fea95f1123d23f76c57f106713b1612bbf9",
-                    "nonce" : "0xc96c8683b1ca9f58",
+                    "hash" : "0x9c99a2701f6b20dbd55bc412b7940f2c2cf5d5ac774db34302a37837702122db",
+                    "mixHash" : "0x8df7ef15583eb0873fe96f875d89fa87ebaefd1ba2c9fb26194a9e4e971809d8",
+                    "nonce" : "0x40aeef0cb377d295",
                     "number" : "0x01",
                     "parentHash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
-                    "receiptTrie" : "0xc23230561bd601f747891fae593e99e1fcce195b3fb6faa4dc9faaa756b33785",
-                    "stateRoot" : "0x3d0168adb95cd89d179f5164a9788c8a237f6158d788e805ed46a2377fefd739",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x1113b01f3a94180fe0b08902aab7d8aa0b4546affa9188f6f41a4c2c81b32608",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0168adb95cd89d179f5164a9788c8a237f6158d788e805ed46a2377fefd739a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c23230561bd601f747891fae593e99e1fcce195b3fb6faa4dc9faaa756b33785b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0a34152aa5d00e7b0772d8dde00425fea95f1123d23f76c57f106713b1612bbf988c96c8683b1ca9f58f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01113b01f3a94180fe0b08902aab7d8aa0b4546affa9188f6f41a4c2c81b32608a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a08df7ef15583eb0873fe96f875d89fa87ebaefd1ba2c9fb26194a9e4e971809d88840aeef0cb377d295f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0dce79bdef06863817c9b81d4f1cf5130425106a06f37ec9146d621e61683af0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9c99a2701f6b20dbd55bc412b7940f2c2cf5d5ac774db34302a37837702122db",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecover80_d0g0v0_Frontier" : {
+    "CALLCODEEcrecover80_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/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0xc170fac229dd87713a9f553d635e97f4837858db3e77fda8ffe4e139fddc5338",
-                    "mixHash" : "0x89a1889248565f49b9fec0c8aec6aa8367ff0c4c511feb1d325d5ba9be2b7ee6",
-                    "nonce" : "0xe8610da72333ba2c",
+                    "gasUsed" : "0xd6f2",
+                    "hash" : "0xf40b7e1e7b4ed814e25056291ce48f0fa538532408fbd19c6b41f77335179944",
+                    "mixHash" : "0x0f085cc80ac3807f3ac530b68208dfa02c4df135bbb1864459d74074e8494918",
+                    "nonce" : "0xce85ce46f2a3f15a",
                     "number" : "0x01",
                     "parentHash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
-                    "receiptTrie" : "0x8e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481f",
-                    "stateRoot" : "0xc6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46",
+                    "receiptTrie" : "0xc14f0356f34b3ac21bfdcbbe461e26b54c2053e0c971df67dfc70500f61d0945",
+                    "stateRoot" : "0xde9ee0970d199ec7dbba34807338aa3092739d2e432a4d6b200ba8cb632ceeee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a089a1889248565f49b9fec0c8aec6aa8367ff0c4c511feb1d325d5ba9be2b7ee688e8610da72333ba2cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de9ee0970d199ec7dbba34807338aa3092739d2e432a4d6b200ba8cb632ceeeea0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c14f0356f34b3ac21bfdcbbe461e26b54c2053e0c971df67dfc70500f61d0945b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a00f085cc80ac3807f3ac530b68208dfa02c4df135bbb1864459d74074e849491888ce85ce46f2a3f15af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc170fac229dd87713a9f553d635e97f4837858db3e77fda8ffe4e139fddc5338",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf40b7e1e7b4ed814e25056291ce48f0fa538532408fbd19c6b41f77335179944",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d6f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a26e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecover80_d0g0v0_Homestead" : {
+    "CALLCODEEcrecover80_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/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0x242e81a70bad608d84f1d8ce528033f42a9bfdf8ced53378e2c73b9086eb7ddd",
-                    "mixHash" : "0x831199fb946d2ce310f34151e873e891380940f7c3b3d544b2f99c201aca0621",
-                    "nonce" : "0x0548c8f7ffe37976",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x1869856e85ef80032b40c9c6dded4dcd19cb752399f9d1d39f3be89c88ef6349",
+                    "mixHash" : "0x979eafabc299a5e1d7abbfdc06f566d898e8531c75b3ca902cb17763bc6486d2",
+                    "nonce" : "0xa593fe6bc0f82be9",
                     "number" : "0x01",
                     "parentHash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
-                    "receiptTrie" : "0x8e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481f",
-                    "stateRoot" : "0xc6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46",
+                    "receiptTrie" : "0xc23230561bd601f747891fae593e99e1fcce195b3fb6faa4dc9faaa756b33785",
+                    "stateRoot" : "0x3d0168adb95cd89d179f5164a9788c8a237f6158d788e805ed46a2377fefd739",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0831199fb946d2ce310f34151e873e891380940f7c3b3d544b2f99c201aca0621880548c8f7ffe37976f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0168adb95cd89d179f5164a9788c8a237f6158d788e805ed46a2377fefd739a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c23230561bd601f747891fae593e99e1fcce195b3fb6faa4dc9faaa756b33785b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0979eafabc299a5e1d7abbfdc06f566d898e8531c75b3ca902cb17763bc6486d288a593fe6bc0f82be9f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x242e81a70bad608d84f1d8ce528033f42a9bfdf8ced53378e2c73b9086eb7ddd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1869856e85ef80032b40c9c6dded4dcd19cb752399f9d1d39f3be89c88ef6349",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecover80_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecover80_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/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0x90ef6625b7a8571db9ac6baa44a878cee5903b0224a5187861b46013afc448c0",
-                    "mixHash" : "0xa99a2843000821826a68a683a3fd7ea40e350d9e689c7401f53db989fc95161b",
-                    "nonce" : "0xd22f8c3d9673e221",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0x11705a7d664940a39fe99033950b91f19293514591cf0e0abd9263447fad74b6",
+                    "mixHash" : "0xe9437e89d5e4c921654fd85ebd019281d1cba901b349c78ad35546dee79861c6",
+                    "nonce" : "0x3e3244f8c85fde0e",
                     "number" : "0x01",
                     "parentHash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0x1113b01f3a94180fe0b08902aab7d8aa0b4546affa9188f6f41a4c2c81b32608",
+                    "receiptTrie" : "0x8e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481f",
+                    "stateRoot" : "0xc6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01113b01f3a94180fe0b08902aab7d8aa0b4546affa9188f6f41a4c2c81b32608a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0a99a2843000821826a68a683a3fd7ea40e350d9e689c7401f53db989fc95161b88d22f8c3d9673e221f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0e9437e89d5e4c921654fd85ebd019281d1cba901b349c78ad35546dee79861c6883e3244f8c85fde0ef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90ef6625b7a8571db9ac6baa44a878cee5903b0224a5187861b46013afc448c0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x11705a7d664940a39fe99033950b91f19293514591cf0e0abd9263447fad74b6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a598",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecover80_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0x4cd735ef496042835fd92dc630ebe97b9463ebb7adc12e2183e1ceef40f65e06",
+                    "mixHash" : "0xd97e87d68e2629445e15b6c1745afe2b740eb927df263fafc346af8e3804915f",
+                    "nonce" : "0xe6147b03c276b2a5",
+                    "number" : "0x01",
+                    "parentHash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
+                    "receiptTrie" : "0x8e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481f",
+                    "stateRoot" : "0xc6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0af5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6e578caecc6607a1c4640ea81540d1fbdd797f57af632999d05eb78f2152f46a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08e6a8542a78e70b81c0575dde48effe4398748d1986e03b0da59d8842dfb481fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0d97e87d68e2629445e15b6c1745afe2b740eb927df263fafc346af8e3804915f88e6147b03c276b2a5f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xaf5438eb7c7c6baa06a02b4376215e265954e7a160a220d614985a3bb590408a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12f11e90a54949ae9e2b3c2b656c923016014b484499f674947162f43f52676a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4cd735ef496042835fd92dc630ebe97b9463ebb7adc12e2183e1ceef40f65e06",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a761a598",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0.json
index e42aca896..5f883ae94 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecoverH_prefixed0_d0g0v0_EIP150" : {
+    "CALLCODEEcrecoverH_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01118a",
-                    "hash" : "0xae18838bbfa0c9082d81cba435534734560268f21f83149249b0a81cefed337f",
-                    "mixHash" : "0xa69712ff40f452823fd00e53963cb90440cc2a023e42fb6d9985761dd3f525a2",
-                    "nonce" : "0x252e49192ce20ae2",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0xff01249330c48a2913000ad457df8eae26631d8fd8b998c33af43d398ec1eadd",
+                    "mixHash" : "0x55730c0e4cdb87ab6e6da0b1ef0eaf848db039f6c1096e9f1fb5e830ad91e207",
+                    "nonce" : "0x8231e19dfddb6dce",
                     "number" : "0x01",
                     "parentHash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
-                    "receiptTrie" : "0x550f508f9f5077ad55a6d6d859de450d5a6291cd2c4c0d3828ee64a7aa169a96",
-                    "stateRoot" : "0x0e562faa2f8ceb174a97ea6e59a48b41a6d20b6af86318855b2a7ed70a361217",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0xd80066a5f4051dad266feabc634afdbe31179a30de5081b11ee71bce98fbd03c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e562faa2f8ceb174a97ea6e59a48b41a6d20b6af86318855b2a7ed70a361217a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0550f508f9f5077ad55a6d6d859de450d5a6291cd2c4c0d3828ee64a7aa169a96b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301118a8203e880a0a69712ff40f452823fd00e53963cb90440cc2a023e42fb6d9985761dd3f525a288252e49192ce20ae2f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d80066a5f4051dad266feabc634afdbe31179a30de5081b11ee71bce98fbd03ca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a055730c0e4cdb87ab6e6da0b1ef0eaf848db039f6c1096e9f1fb5e830ad91e207888231e19dfddb6dcef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae18838bbfa0c9082d81cba435534734560268f21f83149249b0a81cefed337f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xff01249330c48a2913000ad457df8eae26631d8fd8b998c33af43d398ec1eadd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -75,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5118a",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167d6",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -106,10 +113,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverH_prefixed0_d0g0v0_EIP158" : {
+    "CALLCODEEcrecoverH_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0111b2",
-                    "hash" : "0xbf481436fc535d7d9dcc516f51662061a996616c22007730946d357315e78792",
-                    "mixHash" : "0xd8e5d8caa8a10dd8dcc5d3739ac4e68bb26a42e4078fc71fbb267570a906892d",
-                    "nonce" : "0x6d51dd89e8c7eadd",
+                    "hash" : "0x87056aca2ba413d3a5d34ab894935de31c58d465decba907407f6db567ef64e1",
+                    "mixHash" : "0xa22c111b3f79fcb7b238c8e104c464cbef59dc2b4235188b7ccc0e86cd2ef319",
+                    "nonce" : "0x34c2028124219006",
                     "number" : "0x01",
                     "parentHash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
-                    "receiptTrie" : "0xa2bbcada937cae337fde71f7ee388a852b20ec4b4c935327ae30e861a995eb6f",
-                    "stateRoot" : "0x1dbb78d71e0cd4679efac1bcdb7515317b5b3d685d49db84a5831eecb74cc7dc",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0xd80066a5f4051dad266feabc634afdbe31179a30de5081b11ee71bce98fbd03c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dbb78d71e0cd4679efac1bcdb7515317b5b3d685d49db84a5831eecb74cc7dca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0a2bbcada937cae337fde71f7ee388a852b20ec4b4c935327ae30e861a995eb6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0d8e5d8caa8a10dd8dcc5d3739ac4e68bb26a42e4078fc71fbb267570a906892d886d51dd89e8c7eaddf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d80066a5f4051dad266feabc634afdbe31179a30de5081b11ee71bce98fbd03ca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0a22c111b3f79fcb7b238c8e104c464cbef59dc2b4235188b7ccc0e86cd2ef3198834c2028124219006f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf481436fc535d7d9dcc516f51662061a996616c22007730946d357315e78792",
-        "network" : "EIP158",
+        "lastblockhash" : "0x87056aca2ba413d3a5d34ab894935de31c58d465decba907407f6db567ef64e1",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverH_prefixed0_d0g0v0_Frontier" : {
+    "CALLCODEEcrecoverH_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010e60",
-                    "hash" : "0x5eb424b867e8c4e5fc6f0da79453f129e23edf454ec061c88a7af7be25521f45",
-                    "mixHash" : "0x2b7364b9ed504fe4c9593c5da92aabd80f0f7f490937ebd343062397b397bf5e",
-                    "nonce" : "0x00a616a710518875",
+                    "gasUsed" : "0x01118a",
+                    "hash" : "0x7f0173c4bbe9923204e7ab94f17bdcd311d2c8118539ea3259f1a4efe6f46f13",
+                    "mixHash" : "0xb8e8c5cfca1eea55509bf41207e0bd39624ec851a01b8077063175c09d999232",
+                    "nonce" : "0x488606debc2cdbb1",
                     "number" : "0x01",
                     "parentHash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
-                    "receiptTrie" : "0x7f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265",
-                    "stateRoot" : "0x49a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9",
+                    "receiptTrie" : "0x550f508f9f5077ad55a6d6d859de450d5a6291cd2c4c0d3828ee64a7aa169a96",
+                    "stateRoot" : "0x0e562faa2f8ceb174a97ea6e59a48b41a6d20b6af86318855b2a7ed70a361217",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a07f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a02b7364b9ed504fe4c9593c5da92aabd80f0f7f490937ebd343062397b397bf5e8800a616a710518875f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e562faa2f8ceb174a97ea6e59a48b41a6d20b6af86318855b2a7ed70a361217a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0550f508f9f5077ad55a6d6d859de450d5a6291cd2c4c0d3828ee64a7aa169a96b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301118a8203e880a0b8e8c5cfca1eea55509bf41207e0bd39624ec851a01b8077063175c09d99923288488606debc2cdbb1f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5eb424b867e8c4e5fc6f0da79453f129e23edf454ec061c88a7af7be25521f45",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7f0173c4bbe9923204e7ab94f17bdcd311d2c8118539ea3259f1a4efe6f46f13",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +303,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50e60",
+                "balance" : "0x4563918244f5118a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b00",
+                "balance" : "0x0de0b6b3a76167d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +334,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverH_prefixed0_d0g0v0_Homestead" : {
+    "CALLCODEEcrecoverH_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010e60",
-                    "hash" : "0x5868b59d1a20876fa38e1ce26ccf48c3117b1fed01f7f075c62eb11580e2b061",
-                    "mixHash" : "0xd1084fa30bc644702a19d2fd3e4f51ff7101279b0f664575f293b8d3a3f7ae16",
-                    "nonce" : "0x3da0de9071c51a33",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0xb2201fc3c53c61944db69005ad42631d2d72fed6f413f1323d5e29d13f2e45e4",
+                    "mixHash" : "0xd27bef6b9297e19fb14742ec929591d032d02d75de10baae9f37d8b0c06f3b3c",
+                    "nonce" : "0xabc3a6fd45dee1f3",
                     "number" : "0x01",
                     "parentHash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
-                    "receiptTrie" : "0x7f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265",
-                    "stateRoot" : "0x49a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9",
+                    "receiptTrie" : "0xa2bbcada937cae337fde71f7ee388a852b20ec4b4c935327ae30e861a995eb6f",
+                    "stateRoot" : "0x1dbb78d71e0cd4679efac1bcdb7515317b5b3d685d49db84a5831eecb74cc7dc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a07f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a0d1084fa30bc644702a19d2fd3e4f51ff7101279b0f664575f293b8d3a3f7ae16883da0de9071c51a33f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dbb78d71e0cd4679efac1bcdb7515317b5b3d685d49db84a5831eecb74cc7dca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0a2bbcada937cae337fde71f7ee388a852b20ec4b4c935327ae30e861a995eb6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0d27bef6b9297e19fb14742ec929591d032d02d75de10baae9f37d8b0c06f3b3c88abc3a6fd45dee1f3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5868b59d1a20876fa38e1ce26ccf48c3117b1fed01f7f075c62eb11580e2b061",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb2201fc3c53c61944db69005ad42631d2d72fed6f413f1323d5e29d13f2e45e4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -396,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50e60",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b00",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -427,10 +441,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverH_prefixed0_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecoverH_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +455,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0111b2",
-                    "hash" : "0xd199924a2120f134261f378bb8f69a5c73e90680a5809aee61f1a97a1e9f4592",
-                    "mixHash" : "0x14e709bc979ad7951cd49b0d47e2344db725466b5f9020131a3dfc77eacbb0b3",
-                    "nonce" : "0xf8fd74f6df193e7c",
+                    "gasUsed" : "0x010e60",
+                    "hash" : "0x2c643e07f606c6fb42f1cec528c3467fbcd9bb120e593a7b2fd540b7153c699d",
+                    "mixHash" : "0xc509ef91ac2a0162ae59e0ef8cff2cecf99442b3d2b6e4bc62a483f1fcf09632",
+                    "nonce" : "0x8f3ae076a3d27a24",
                     "number" : "0x01",
                     "parentHash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
-                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
-                    "stateRoot" : "0xd80066a5f4051dad266feabc634afdbe31179a30de5081b11ee71bce98fbd03c",
+                    "receiptTrie" : "0x7f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265",
+                    "stateRoot" : "0x49a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d80066a5f4051dad266feabc634afdbe31179a30de5081b11ee71bce98fbd03ca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a014e709bc979ad7951cd49b0d47e2344db725466b5f9020131a3dfc77eacbb0b388f8fd74f6df193e7cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a07f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a0c509ef91ac2a0162ae59e0ef8cff2cecf99442b3d2b6e4bc62a483f1fcf09632888f3ae076a3d27a24f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd199924a2120f134261f378bb8f69a5c73e90680a5809aee61f1a97a1e9f4592",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2c643e07f606c6fb42f1cec528c3467fbcd9bb120e593a7b2fd540b7153c699d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa0b29af6a56d6cfef6415cb195ccbe540e006d0a",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50e60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616b00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecoverH_prefixed0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x010e60",
+                    "hash" : "0x80906e7d5b4a18c16bbdb8482f89212e736379d3303a3cbc8630fe02f6cdcf62",
+                    "mixHash" : "0xfe62068e0f5fce081e078c91cb0f43703925d896ad0fb0e46a4d0e8f20abaaa5",
+                    "nonce" : "0xec8f8ab6f4e28d2e",
+                    "number" : "0x01",
+                    "parentHash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
+                    "receiptTrie" : "0x7f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265",
+                    "stateRoot" : "0x49a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0aae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059dba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049a6cf9d690fe2f9b778cbe4803983f7e721cb7db399fa22ac8d3b0c8fd80bb9a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a07f1fd38a466cbd995e3eb129f56de2a1638faf72b8a61b6ff2176a3b9ec72265b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a0fe62068e0f5fce081e078c91cb0f43703925d896ad0fb0e46a4d0e8f20abaaa588ec8f8ab6f4e28d2ef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xaae5cc68d486d4f9108683112999e854895e09580e5acf8738fa66a744c059db",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03644e72c4c866b5af5be7cd18753c3d7153dddc2f0b7830ed66872bc82e36055a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x80906e7d5b4a18c16bbdb8482f89212e736379d3303a3cbc8630fe02f6cdcf62",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f511b2",
+                "balance" : "0x4563918244f50e60",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167ae",
+                "balance" : "0x0de0b6b3a7616b00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0.json
index ec3032d79..fcd633840 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecoverR_prefixed0_d0g0v0_EIP150" : {
+    "CALLCODEEcrecoverR_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd6f2",
-                    "hash" : "0x250c1ed04fb884774ad8be417f5d6f0ba7fa826cdbfe91b2021dec950543965b",
-                    "mixHash" : "0x5794f6d1b6b69a6e28dc50a385d60d40ffb1acd6116361c7e7c2b6546da5773e",
-                    "nonce" : "0xb91d7d995ce624ec",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x10e41eabf046f51b525e192f983a33da5c6088d57706f603e3caada1f134040b",
+                    "mixHash" : "0x0ffa99db44c84c4c4c87594b1bf12c1566fd3569009a061d51a335f252dd1853",
+                    "nonce" : "0x0008dd0f5d0036e2",
                     "number" : "0x01",
                     "parentHash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
-                    "receiptTrie" : "0xc3168711093bf6add10d4ce2be68f31063d352edcec6b4369638acb262b4b089",
-                    "stateRoot" : "0x512fe3d0f42977cecb6a2fd86fca5ddcd04caf050afdbc09fdf7c6e1e0631dbd",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x67a660b9f97936b4fcae0cddb75a21f40da42999ae25288f4a1989a1e2b21116",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0512fe3d0f42977cecb6a2fd86fca5ddcd04caf050afdbc09fdf7c6e1e0631dbda0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c3168711093bf6add10d4ce2be68f31063d352edcec6b4369638acb262b4b089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a05794f6d1b6b69a6e28dc50a385d60d40ffb1acd6116361c7e7c2b6546da5773e88b91d7d995ce624ecf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067a660b9f97936b4fcae0cddb75a21f40da42999ae25288f4a1989a1e2b21116a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a00ffa99db44c84c4c4c87594b1bf12c1566fd3569009a061d51a335f252dd1853880008dd0f5d0036e2f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x250c1ed04fb884774ad8be417f5d6f0ba7fa826cdbfe91b2021dec950543965b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x10e41eabf046f51b525e192f983a33da5c6088d57706f603e3caada1f134040b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d6f2",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a26e",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverR_prefixed0_d0g0v0_EIP158" : {
+    "CALLCODEEcrecoverR_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x764a47db1a39b59a142dfeeda5ad330142ed0b1c12a6fa1ccfb36c57043417a0",
-                    "mixHash" : "0xcf1b4f4466004716249666aea10e000be2e24e18fbbf80307d339a557144cd10",
-                    "nonce" : "0x86eca4bf8feede1c",
+                    "hash" : "0x6e7656080e258f0fefaa344c1d15dc68a2e1086cac60a15a0771c15ac54e67a4",
+                    "mixHash" : "0xffd2c543e8ada60c1d92533333ef20f17811db90f5fa05dbb9c4216929c76317",
+                    "nonce" : "0x103ac557c3afa70f",
                     "number" : "0x01",
                     "parentHash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
-                    "receiptTrie" : "0xe6537e84207543fad3d2d31828523eecfed70cf9340ae461c573c6836d2572f8",
-                    "stateRoot" : "0x05bbbc7d8ff1544650cd7f09b0b336401d2bda05d2f2d4d32888dadb16a17bd8",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x67a660b9f97936b4fcae0cddb75a21f40da42999ae25288f4a1989a1e2b21116",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005bbbc7d8ff1544650cd7f09b0b336401d2bda05d2f2d4d32888dadb16a17bd8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e6537e84207543fad3d2d31828523eecfed70cf9340ae461c573c6836d2572f8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0cf1b4f4466004716249666aea10e000be2e24e18fbbf80307d339a557144cd108886eca4bf8feede1cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067a660b9f97936b4fcae0cddb75a21f40da42999ae25288f4a1989a1e2b21116a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0ffd2c543e8ada60c1d92533333ef20f17811db90f5fa05dbb9c4216929c7631788103ac557c3afa70ff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x764a47db1a39b59a142dfeeda5ad330142ed0b1c12a6fa1ccfb36c57043417a0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6e7656080e258f0fefaa344c1d15dc68a2e1086cac60a15a0771c15ac54e67a4",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverR_prefixed0_d0g0v0_Frontier" : {
+    "CALLCODEEcrecoverR_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0xd02f3dabf2a84acf56b70cfa09431e6124e4cf87eae8ad206aff5203400ac62c",
-                    "mixHash" : "0x7b972a16992bf4824151cdbb88681e7111aa048155fb2cf7d102ae847d57f400",
-                    "nonce" : "0x6e6bc9bf4cb33d8f",
+                    "gasUsed" : "0xd6f2",
+                    "hash" : "0x3ed10264cf0f9d61382ff38faf100988258a870b73f58167e92d3fe9db92413e",
+                    "mixHash" : "0xd24e82493e2a540d1417df311c9f5b0a6af010affa8366c029733d2fd1bc6b76",
+                    "nonce" : "0x88002c0d9d29967a",
                     "number" : "0x01",
                     "parentHash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
-                    "receiptTrie" : "0xeafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fa",
-                    "stateRoot" : "0x11ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2",
+                    "receiptTrie" : "0xc3168711093bf6add10d4ce2be68f31063d352edcec6b4369638acb262b4b089",
+                    "stateRoot" : "0x512fe3d0f42977cecb6a2fd86fca5ddcd04caf050afdbc09fdf7c6e1e0631dbd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa011ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0eafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a07b972a16992bf4824151cdbb88681e7111aa048155fb2cf7d102ae847d57f400886e6bc9bf4cb33d8ff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0512fe3d0f42977cecb6a2fd86fca5ddcd04caf050afdbc09fdf7c6e1e0631dbda0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c3168711093bf6add10d4ce2be68f31063d352edcec6b4369638acb262b4b089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6f28203e880a0d24e82493e2a540d1417df311c9f5b0a6af010affa8366c029733d2fd1bc6b768888002c0d9d29967af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd02f3dabf2a84acf56b70cfa09431e6124e4cf87eae8ad206aff5203400ac62c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3ed10264cf0f9d61382ff38faf100988258a870b73f58167e92d3fe9db92413e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d6f2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a26e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverR_prefixed0_d0g0v0_Homestead" : {
+    "CALLCODEEcrecoverR_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd3c8",
-                    "hash" : "0x1be9aade9381971c6c476e77b774d987e76b08ac3a7ea4876a36cb4a1ad26ea3",
-                    "mixHash" : "0x6607a5b88304166044f9b7359f3b728f7c7ec072be2b8eb66655f7c3b0708f15",
-                    "nonce" : "0x0ea3e7d299cf2325",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x6a4183e36a1eb0abf94c0e5dd716931228858354def40bfb504f440a10e55777",
+                    "mixHash" : "0xd631107abb46d2292aa104e46d9b66cbf73281f8a61069f74f942ec5204e75a9",
+                    "nonce" : "0x2a1498bcc9324964",
                     "number" : "0x01",
                     "parentHash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
-                    "receiptTrie" : "0xeafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fa",
-                    "stateRoot" : "0x11ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2",
+                    "receiptTrie" : "0xe6537e84207543fad3d2d31828523eecfed70cf9340ae461c573c6836d2572f8",
+                    "stateRoot" : "0x05bbbc7d8ff1544650cd7f09b0b336401d2bda05d2f2d4d32888dadb16a17bd8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa011ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0eafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a06607a5b88304166044f9b7359f3b728f7c7ec072be2b8eb66655f7c3b0708f15880ea3e7d299cf2325f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005bbbc7d8ff1544650cd7f09b0b336401d2bda05d2f2d4d32888dadb16a17bd8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e6537e84207543fad3d2d31828523eecfed70cf9340ae461c573c6836d2572f8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0d631107abb46d2292aa104e46d9b66cbf73281f8a61069f74f942ec5204e75a9882a1498bcc9324964f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1be9aade9381971c6c476e77b774d987e76b08ac3a7ea4876a36cb4a1ad26ea3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6a4183e36a1eb0abf94c0e5dd716931228858354def40bfb504f440a10e55777",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d3c8",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a598",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverR_prefixed0_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecoverR_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0xb80a386f944fc2f3c2fcab4df109c35849c73bc58cc602c23e2537cfe6cb3cb8",
-                    "mixHash" : "0x74bbddb00474f20279b6d920a2888a0fc0a8dba9c0f1c61d892e14235d4c53be",
-                    "nonce" : "0xec4875b9c7f88940",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0xff67b0a4a1778bbc532532fe6218a5292b38bdf25a449dded8530d228b3cbd1a",
+                    "mixHash" : "0x51d889cf4e38e3d8f93cf78a175f08a5684ca77863b7befa44dfd949ee93adf6",
+                    "nonce" : "0x1e39d2ada5537b90",
                     "number" : "0x01",
                     "parentHash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0x67a660b9f97936b4fcae0cddb75a21f40da42999ae25288f4a1989a1e2b21116",
+                    "receiptTrie" : "0xeafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fa",
+                    "stateRoot" : "0x11ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067a660b9f97936b4fcae0cddb75a21f40da42999ae25288f4a1989a1e2b21116a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a074bbddb00474f20279b6d920a2888a0fc0a8dba9c0f1c61d892e14235d4c53be88ec4875b9c7f88940f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa011ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0eafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a051d889cf4e38e3d8f93cf78a175f08a5684ca77863b7befa44dfd949ee93adf6881e39d2ada5537b90f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb80a386f944fc2f3c2fcab4df109c35849c73bc58cc602c23e2537cfe6cb3cb8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xff67b0a4a1778bbc532532fe6218a5292b38bdf25a449dded8530d228b3cbd1a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a598",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecoverR_prefixed0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd3c8",
+                    "hash" : "0xbe36417892fdc0b1b39a118017d9d66ce0ee5b2f899072beced479c576254112",
+                    "mixHash" : "0xf08b081f55bd97a90068a476f840b0eb38491e96352ef94469aedb7da454ec17",
+                    "nonce" : "0x0e3ccc207bd855d1",
+                    "number" : "0x01",
+                    "parentHash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
+                    "receiptTrie" : "0xeafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fa",
+                    "stateRoot" : "0x11ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0daa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa011ca60869cff8a10869f258b9151c63b4b34ae8f8ab6190681479c191e6d5ce2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0eafa5e0f67ef651a18fd6f911afddb9f647c4d247e316b1ce216d6d19c61c6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3c88203e880a0f08b081f55bd97a90068a476f840b0eb38491e96352ef94469aedb7da454ec17880e3ccc207bd855d1f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xdaa1ceaf445e1c0fcdbc1cc3f0757427303c511088bf49761504f2fceb5d0c4e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b76b8d1eb444530bc293c5ca87d376250ca17028ce6ea2b4e325f9c8da6271dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe36417892fdc0b1b39a118017d9d66ce0ee5b2f899072beced479c576254112",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f4d3c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a761a598",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0.json
index 6ae184028..67f684a13 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecoverS_prefixed0_d0g0v0_EIP150" : {
+    "CALLCODEEcrecoverS_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01118a",
-                    "hash" : "0x4cea097419a0f66b63343dbd8071fca667e5fbe74fd5ac9c3e6aa5bdd295cf57",
-                    "mixHash" : "0x0e9402aefffbf5cc26cec5129b80abdee11b62e8f6668ce650094eee324e1487",
-                    "nonce" : "0xd4063086ae0937ba",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x818433d6b4fb38c31026b6771b0d66a463c29a5f341cc205f2163cd4ee98f712",
+                    "mixHash" : "0xbfbd6e1bca38b6ac855032e4f35912657d9e4bc6b419fb8931fa74902c412eef",
+                    "nonce" : "0x3f7baaedbe642362",
                     "number" : "0x01",
                     "parentHash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
-                    "receiptTrie" : "0x9e8c2412b6a141771f6f3d5f1ae76249a81bd3e25cc9fb4dc16fbf7fdffc89a9",
-                    "stateRoot" : "0xc888c3e49e1abac7e761f55942c6cc99b349b846aca8cb2412d08a4b9f5277d2",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x454a52b033402762816e4bf52c157e9d54ca469336c8a715e521a01be2ce0fad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c888c3e49e1abac7e761f55942c6cc99b349b846aca8cb2412d08a4b9f5277d2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a09e8c2412b6a141771f6f3d5f1ae76249a81bd3e25cc9fb4dc16fbf7fdffc89a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301118a8203e880a00e9402aefffbf5cc26cec5129b80abdee11b62e8f6668ce650094eee324e148788d4063086ae0937baf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0454a52b033402762816e4bf52c157e9d54ca469336c8a715e521a01be2ce0fada0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0bfbd6e1bca38b6ac855032e4f35912657d9e4bc6b419fb8931fa74902c412eef883f7baaedbe642362f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cea097419a0f66b63343dbd8071fca667e5fbe74fd5ac9c3e6aa5bdd295cf57",
-        "network" : "EIP150",
+        "lastblockhash" : "0x818433d6b4fb38c31026b6771b0d66a463c29a5f341cc205f2163cd4ee98f712",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -75,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5118a",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167d6",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -106,10 +113,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverS_prefixed0_d0g0v0_EIP158" : {
+    "CALLCODEEcrecoverS_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0111b2",
-                    "hash" : "0xfe2fc765c8361f4d7ec16cfabdc8a577e734f43e4c99a4fa2eb025c2161f381e",
-                    "mixHash" : "0xf3e17debc0e73fa2dd18aec18cc78ae5cbe4fe0147f45c51602d0fcdfdb27067",
-                    "nonce" : "0xccc8ddf272f31800",
+                    "hash" : "0xfa201f75bceaa6c3269d8f38c986045d074c781360df69cd8867c192b56e44bc",
+                    "mixHash" : "0xe3d467db6dfb330a943cb134a2d2427a1243f8a8583159a0c3fb4edd50bb174c",
+                    "nonce" : "0xc59ac0261e6df8f6",
                     "number" : "0x01",
                     "parentHash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
-                    "receiptTrie" : "0x35ffa04049a26551e578a28af2677a5f30ed7cd1f0f7f2902cb397078f01679a",
-                    "stateRoot" : "0xd13125a614258e3488470a1f66db0bd80bad0084d4fdf8d976f79ab3ce723039",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x454a52b033402762816e4bf52c157e9d54ca469336c8a715e521a01be2ce0fad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d13125a614258e3488470a1f66db0bd80bad0084d4fdf8d976f79ab3ce723039a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a035ffa04049a26551e578a28af2677a5f30ed7cd1f0f7f2902cb397078f01679ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0f3e17debc0e73fa2dd18aec18cc78ae5cbe4fe0147f45c51602d0fcdfdb2706788ccc8ddf272f31800f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0454a52b033402762816e4bf52c157e9d54ca469336c8a715e521a01be2ce0fada0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0e3d467db6dfb330a943cb134a2d2427a1243f8a8583159a0c3fb4edd50bb174c88c59ac0261e6df8f6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe2fc765c8361f4d7ec16cfabdc8a577e734f43e4c99a4fa2eb025c2161f381e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfa201f75bceaa6c3269d8f38c986045d074c781360df69cd8867c192b56e44bc",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverS_prefixed0_d0g0v0_Frontier" : {
+    "CALLCODEEcrecoverS_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010e60",
-                    "hash" : "0xde2baa58da50a3020d0facd29afeb7e40a7c204b9b6baffa1b7f44967b60de58",
-                    "mixHash" : "0x2a8fc45174123198320ea7aba3c780ad94ec66f84c1603d30d394cc0a1cbff62",
-                    "nonce" : "0x89c886ca5d667888",
+                    "gasUsed" : "0x01118a",
+                    "hash" : "0x9a5c941a6c215e5eac6ee6c2dd8e677431fdbdeb9b967738faad680a1e09f228",
+                    "mixHash" : "0xdd0a03de37040fe69ff3d6114259a2186c30d2ea8b3fdab62dcdce518d7c746e",
+                    "nonce" : "0x502baf6a007d9ce1",
                     "number" : "0x01",
                     "parentHash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
-                    "receiptTrie" : "0x059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0",
-                    "stateRoot" : "0xa077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742",
+                    "receiptTrie" : "0x9e8c2412b6a141771f6f3d5f1ae76249a81bd3e25cc9fb4dc16fbf7fdffc89a9",
+                    "stateRoot" : "0xc888c3e49e1abac7e761f55942c6cc99b349b846aca8cb2412d08a4b9f5277d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a02a8fc45174123198320ea7aba3c780ad94ec66f84c1603d30d394cc0a1cbff628889c886ca5d667888f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c888c3e49e1abac7e761f55942c6cc99b349b846aca8cb2412d08a4b9f5277d2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a09e8c2412b6a141771f6f3d5f1ae76249a81bd3e25cc9fb4dc16fbf7fdffc89a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301118a8203e880a0dd0a03de37040fe69ff3d6114259a2186c30d2ea8b3fdab62dcdce518d7c746e88502baf6a007d9ce1f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde2baa58da50a3020d0facd29afeb7e40a7c204b9b6baffa1b7f44967b60de58",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9a5c941a6c215e5eac6ee6c2dd8e677431fdbdeb9b967738faad680a1e09f228",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +303,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50e60",
+                "balance" : "0x4563918244f5118a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b00",
+                "balance" : "0x0de0b6b3a76167d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +334,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverS_prefixed0_d0g0v0_Homestead" : {
+    "CALLCODEEcrecoverS_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010e60",
-                    "hash" : "0x320f962c6b30f4b05a341df7f5bd938262ca588f9676d950b50eaf7bf1459817",
-                    "mixHash" : "0x994d03b6ecb2a5a003f683dfca133abf46f9c5c7fc422d28de577683857e1085",
-                    "nonce" : "0xdd9f8e5a5574fbc3",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0xc39b13cdeb2da5e0e518813f06df563f38e2373d531d465d75b2c7022c918648",
+                    "mixHash" : "0x2754a3b9b623b84c758d37498e28a96c03968e304c3ab7fb5bf3e4184a01aaa8",
+                    "nonce" : "0xd9ceec48f3029959",
                     "number" : "0x01",
                     "parentHash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
-                    "receiptTrie" : "0x059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0",
-                    "stateRoot" : "0xa077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742",
+                    "receiptTrie" : "0x35ffa04049a26551e578a28af2677a5f30ed7cd1f0f7f2902cb397078f01679a",
+                    "stateRoot" : "0xd13125a614258e3488470a1f66db0bd80bad0084d4fdf8d976f79ab3ce723039",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a0994d03b6ecb2a5a003f683dfca133abf46f9c5c7fc422d28de577683857e108588dd9f8e5a5574fbc3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d13125a614258e3488470a1f66db0bd80bad0084d4fdf8d976f79ab3ce723039a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a035ffa04049a26551e578a28af2677a5f30ed7cd1f0f7f2902cb397078f01679ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a02754a3b9b623b84c758d37498e28a96c03968e304c3ab7fb5bf3e4184a01aaa888d9ceec48f3029959f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x320f962c6b30f4b05a341df7f5bd938262ca588f9676d950b50eaf7bf1459817",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc39b13cdeb2da5e0e518813f06df563f38e2373d531d465d75b2c7022c918648",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -396,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50e60",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b00",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -427,10 +441,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverS_prefixed0_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecoverS_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +455,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0111b2",
-                    "hash" : "0x374ab4d0fce74eb26d30ba3d10a618e0d2c2d138c02b151b25beddf67c018ae3",
-                    "mixHash" : "0x395310bc27448cc5151184f567e2e7ba5b6aca739abbab4cd06fbc157e92d142",
-                    "nonce" : "0x5ef7f798ae513c93",
+                    "gasUsed" : "0x010e60",
+                    "hash" : "0x09f6ff6a4ded95862b651ffdc1fc0ce12ab5c343f30d4ec79ad1dd92a41a9b97",
+                    "mixHash" : "0x96a0c402930e76c1be2d7259414d277beaa0beac40627e83ccabad6987e0541c",
+                    "nonce" : "0xab7a39e15d10dce3",
                     "number" : "0x01",
                     "parentHash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
-                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
-                    "stateRoot" : "0x454a52b033402762816e4bf52c157e9d54ca469336c8a715e521a01be2ce0fad",
+                    "receiptTrie" : "0x059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0",
+                    "stateRoot" : "0xa077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0454a52b033402762816e4bf52c157e9d54ca469336c8a715e521a01be2ce0fada0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0395310bc27448cc5151184f567e2e7ba5b6aca739abbab4cd06fbc157e92d142885ef7f798ae513c93f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a096a0c402930e76c1be2d7259414d277beaa0beac40627e83ccabad6987e0541c88ab7a39e15d10dce3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x374ab4d0fce74eb26d30ba3d10a618e0d2c2d138c02b151b25beddf67c018ae3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x09f6ff6a4ded95862b651ffdc1fc0ce12ab5c343f30d4ec79ad1dd92a41a9b97",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xb4950a7fad428434b11c357fa6d4b4bcd3096a5d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50e60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616b00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecoverS_prefixed0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x010e60",
+                    "hash" : "0xd1bdec3cf64a73ce0dc41b53017a5abdfbc7a7562846013bbcc59045826a60a8",
+                    "mixHash" : "0x4b812db081f9efc13977fc0d8423aa7f55da301c09797920e0f8cd1963da7066",
+                    "nonce" : "0xdb38cc89728fc30e",
+                    "number" : "0x01",
+                    "parentHash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
+                    "receiptTrie" : "0x059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0",
+                    "stateRoot" : "0xa077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a03f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a077cf4346bac13e043a794de4d77ef66f4d87782073a5ede84d5639f4697742a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0059955a4490ff430b240f70cda7135dea912c715fbad13be8c438becf93730b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010e608203e880a04b812db081f9efc13977fc0d8423aa7f55da301c09797920e0f8cd1963da706688db38cc89728fc30ef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3f4fb491232e62b20e7fd2a0cc2245dc2094c90137d55cdab250219c7cfc9b4c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429ba92808805be08f69f58c5b5c4bc6b254590f2dd60674fca88bcedc61285da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd1bdec3cf64a73ce0dc41b53017a5abdfbc7a7562846013bbcc59045826a60a8",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f511b2",
+                "balance" : "0x4563918244f50e60",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167ae",
+                "balance" : "0x0de0b6b3a7616b00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0.json
index f179fa2b2..9d7d151ab 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecoverV_prefixed0_d0g0v0_EIP150" : {
+    "CALLCODEEcrecoverV_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c22",
-                    "hash" : "0x5f0a391e6fe98a7f526fd70ba0ff1acc3a9be8bd791043d972c900e0833569c1",
-                    "mixHash" : "0xbf37373586168d43ab1fa834a9ca1a8922b5ddfb407bdb297fbf4bbc98336d87",
-                    "nonce" : "0x0123faad6aaa90c8",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x3f258a8cbd4f65d05baa895e2123c46671b2ec5c76a592d974d80b3b113f17ce",
+                    "mixHash" : "0x66c0b0ede8a2b247e077d472d539023091ae37f4bd7b5d4137314447eb040fc3",
+                    "nonce" : "0x3e09f8c0690c3bd0",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0xf1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47",
-                    "stateRoot" : "0xc93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xcaa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86faf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c228203e880a0bf37373586168d43ab1fa834a9ca1a8922b5ddfb407bdb297fbf4bbc98336d87880123faad6aaa90c8f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0caa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86fafa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a066c0b0ede8a2b247e077d472d539023091ae37f4bd7b5d4137314447eb040fc3883e09f8c0690c3bd0f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f0a391e6fe98a7f526fd70ba0ff1acc3a9be8bd791043d972c900e0833569c1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3f258a8cbd4f65d05baa895e2123c46671b2ec5c76a592d974d80b3b113f17ce",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -76,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c22",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d3e",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -107,10 +114,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixed0_d0g0v0_EIP158" : {
+    "CALLCODEEcrecoverV_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c4a",
-                    "hash" : "0x99519fa018d57086194f984e63661245d2201ae38b9848ca346799876ee61f36",
-                    "mixHash" : "0xb3bf51503c536d7219c1152a517a8646c5b70833ad296ff4bf9e789f6175d754",
-                    "nonce" : "0xbc7eb31db1744487",
+                    "hash" : "0x60ffa3ec2e7be77fc01786fec1fac29df9090e38713631d83aeb439fa02e89b0",
+                    "mixHash" : "0xebfc052dadec34e4dcc792ae26fb39f93703042b7b323f491e55a9790bf992ed",
+                    "nonce" : "0xdd9a26128c2cf898",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0x3e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4a",
-                    "stateRoot" : "0x3c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xcaa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86faf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a03e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0b3bf51503c536d7219c1152a517a8646c5b70833ad296ff4bf9e789f6175d75488bc7eb31db1744487f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0caa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86fafa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0ebfc052dadec34e4dcc792ae26fb39f93703042b7b323f491e55a9790bf992ed88dd9a26128c2cf898f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -170,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99519fa018d57086194f984e63661245d2201ae38b9848ca346799876ee61f36",
-        "network" : "EIP158",
+        "lastblockhash" : "0x60ffa3ec2e7be77fc01786fec1fac29df9090e38713631d83aeb439fa02e89b0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixed0_d0g0v0_Frontier" : {
+    "CALLCODEEcrecoverV_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -229,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f8",
-                    "hash" : "0x4ba466cb9015bb7b6e87610b6548a7889f9aa2c0694dd3e08a5f748ef8641025",
-                    "mixHash" : "0x5ad2e718494135064cfb1a1aea0e84b66e303d3fa793dd090bdff2c79247b77a",
-                    "nonce" : "0xcfe0f87f815f0215",
+                    "gasUsed" : "0x014c22",
+                    "hash" : "0xa41980726ab88b99be8ad1cf2bd054fcf58f85f885adf60b8b9656a9e1bad594",
+                    "mixHash" : "0x7fc9ce7d4fc01e78484141a539c80036a8db089d1dcc9b1b0ad657c393815847",
+                    "nonce" : "0x98ac6448ca749aca",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
-                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
+                    "receiptTrie" : "0xf1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47",
+                    "stateRoot" : "0xc93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a05ad2e718494135064cfb1a1aea0e84b66e303d3fa793dd090bdff2c79247b77a88cfe0f87f815f0215f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c93a933cdaa196d4e774eee3f7b657b1c9de0a0c331b86d796fddeafbee2c2e7a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f1102bc83642f117c5252d8ccbda1076003a1224da2f331d5b5be3f6952fda47b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c228203e880a07fc9ce7d4fc01e78484141a539c80036a8db089d1dcc9b1b0ad657c3938158478898ac6448ca749acaf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -278,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ba466cb9015bb7b6e87610b6548a7889f9aa2c0694dd3e08a5f748ef8641025",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa41980726ab88b99be8ad1cf2bd054fcf58f85f885adf60b8b9656a9e1bad594",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -292,14 +306,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f8",
+                "balance" : "0x4563918244f54c22",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7613068",
+                "balance" : "0x0de0b6b3a7612d3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -323,10 +337,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixed0_d0g0v0_Homestead" : {
+    "CALLCODEEcrecoverV_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -337,19 +351,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0148f8",
-                    "hash" : "0x25e4bacffe4069fb3ff467a29c5f634c0b056160c6ad7c04b88f3d7b401d15cf",
-                    "mixHash" : "0x525db1286db0ab1d6250bf085c86a4664ea204fb9b6c91d61efc3a8a6740bc32",
-                    "nonce" : "0xe4fe5a166baaf23c",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x0a86a1ac46434a103e23f026de79a6feedae042a68404abea85d5bb928348da1",
+                    "mixHash" : "0xb1042dfeb3fc1c9e0437b64847de85b425624af044ffb56cb2c206f07f3ba6fa",
+                    "nonce" : "0xd5173adccc1ab8f7",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
-                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
+                    "receiptTrie" : "0x3e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4a",
+                    "stateRoot" : "0x3c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a0525db1286db0ab1d6250bf085c86a4664ea204fb9b6c91d61efc3a8a6740bc3288e4fe5a166baaf23cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c68daaee43999e56eaa1ba8bfa60f90f774ef62c586b37b398ec15ffd1344d1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a03e6916e27e0dc93d0eba8c3d0009c5b94ad366e95784dd02331a02ea94d98d4ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0b1042dfeb3fc1c9e0437b64847de85b425624af044ffb56cb2c206f07f3ba6fa88d5173adccc1ab8f7f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -386,8 +400,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x25e4bacffe4069fb3ff467a29c5f634c0b056160c6ad7c04b88f3d7b401d15cf",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0a86a1ac46434a103e23f026de79a6feedae042a68404abea85d5bb928348da1",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -400,14 +414,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548f8",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7613068",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -431,10 +445,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixed0_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecoverV_prefixed0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -445,19 +459,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c4a",
-                    "hash" : "0xd91f3d8833bb150fffd687769d52a1c561116ae7f2792438cd6889e744282318",
-                    "mixHash" : "0xdb9e29db76b4ea24faae2e31c3b10ecd4a733176c2e80d7e8a4f5b88ec12c13f",
-                    "nonce" : "0x1998cd761d3aba25",
+                    "gasUsed" : "0x0148f8",
+                    "hash" : "0xc9d8a176e7a14f3dbdbf00f2a064c3b59c712d92bba69b04288bc638fe0a5175",
+                    "mixHash" : "0x73b421c74fdfd41860c38da107480490aee15e85f9120e2337ba959e1249aa56",
+                    "nonce" : "0xe196d19a9542b4f6",
                     "number" : "0x01",
                     "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
-                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
-                    "stateRoot" : "0xcaa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86faf",
+                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
+                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0caa76ae791800b473f3ad77cda85c8df39d42a378dd06b30cba436fff4b86fafa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0db9e29db76b4ea24faae2e31c3b10ecd4a733176c2e80d7e8a4f5b88ec12c13f881998cd761d3aba25f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a073b421c74fdfd41860c38da107480490aee15e85f9120e2337ba959e1249aa5688e196d19a9542b4f6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -494,16 +508,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd91f3d8833bb150fffd687769d52a1c561116ae7f2792438cd6889e744282318",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc9d8a176e7a14f3dbdbf00f2a064c3b59c712d92bba69b04288bc638fe0a5175",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548f8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7613068",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecoverV_prefixed0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0148f8",
+                    "hash" : "0xd5e049e6af1985df2715cd25e80c8cb9c95b95eac29d160c63d3cefc284ea8fa",
+                    "mixHash" : "0x178f4b923bcfd2e6edcbe0ad26032f24266c4aa0efb7ee1c4255429628a656ed",
+                    "nonce" : "0xd2f07e9c5afcb0df",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
+                    "receiptTrie" : "0xec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828",
+                    "stateRoot" : "0xa86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0a6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a86a4c89021ab4ef17127a4e2ac281072d17eb27fa09085cd3df291c415b36b3a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0ec2bbdf2dcd33e0b46becb82a5db15cb2734060521cf4887ae253eb62a6a1828b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830148f88203e880a0178f4b923bcfd2e6edcbe0ad26032f24266c4aa0efb7ee1c4255429628a656ed88d2f07e9c5afcb0dff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6954d67fb0b9a42d72332d54a86a0bc1d7a47bc86db662d140d8cc6fabbe6bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0150ed8b6702a4667a4e69b87e156170432a0c6f80fcc37db22e337be6c6ce597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd5e049e6af1985df2715cd25e80c8cb9c95b95eac29d160c63d3cefc284ea8fa",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -515,14 +630,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c4a",
+                "balance" : "0x4563918244f548f8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d16",
+                "balance" : "0x0de0b6b3a7613068",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0.json
index b8a47ad98..4f8cd7c9a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecoverV_prefixedf0_d0g0v0_EIP150" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd7f5",
-                    "hash" : "0xc78ae22bff7a93413025b13d0e40c902f4697f2f902d9ec72a564a6405d44de6",
-                    "mixHash" : "0x30f569f7a3758dfd0a2fff2e56be05a5781f6a6497bbcae7347ed4a6fa04c6ee",
-                    "nonce" : "0x1f8a0e2a23eee266",
+                    "gasUsed" : "0xd81d",
+                    "hash" : "0x4ec7250daca6c846983d3ead112310ef8a9116ec336ee9b4f7fe56b13fa00d1f",
+                    "mixHash" : "0xda1b813ab278653bde5c72c2bb5547cae5f6059cef45cbfeb60c938d14e4799a",
+                    "nonce" : "0x5428c3d878fb8438",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0xeec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695a",
-                    "stateRoot" : "0xcfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2",
+                    "receiptTrie" : "0xaafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7",
+                    "stateRoot" : "0xb4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0eec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d7f58203e880a030f569f7a3758dfd0a2fff2e56be05a5781f6a6497bbcae7347ed4a6fa04c6ee881f8a0e2a23eee266f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0aafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a0da1b813ab278653bde5c72c2bb5547cae5f6059cef45cbfeb60c938d14e4799a885428c3d878fb8438f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000f01c",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc78ae22bff7a93413025b13d0e40c902f4697f2f902d9ec72a564a6405d44de6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4ec7250daca6c846983d3ead112310ef8a9116ec336ee9b4f7fe56b13fa00d1f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d7f5",
+                "balance" : "0x4563918244f4d81d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a16b",
+                "balance" : "0x0de0b6b3a761a143",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d0g0v0_EIP158" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd81d",
-                    "hash" : "0x77339c2a4e169a277d663f57afbacd70a018317bead1431634643780886c15a8",
-                    "mixHash" : "0xee5e6959e5dc3aaccbfc883ba94bdcb98c1bf092ca801d8563ca7cf45fde5c3c",
-                    "nonce" : "0xeff26baf002d422b",
+                    "hash" : "0x71f3cbc47cc8e384267b463d73bc08b08c5d3cf9930c67c6adf23271087c3571",
+                    "mixHash" : "0x9986d49c6206e1de9e4df6e9abb0c8fe16ac8b2cc6f4134937a42f4ffaaa5c4d",
+                    "nonce" : "0xc2e7344d2a540bf3",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0x285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2",
-                    "stateRoot" : "0xa99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70",
+                    "receiptTrie" : "0xaafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7",
+                    "stateRoot" : "0xb4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a0ee5e6959e5dc3aaccbfc883ba94bdcb98c1bf092ca801d8563ca7cf45fde5c3c88eff26baf002d422bf885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0aafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a09986d49c6206e1de9e4df6e9abb0c8fe16ac8b2cc6f4134937a42f4ffaaa5c4d88c2e7344d2a540bf3f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000f01c",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77339c2a4e169a277d663f57afbacd70a018317bead1431634643780886c15a8",
-        "network" : "EIP158",
+        "lastblockhash" : "0x71f3cbc47cc8e384267b463d73bc08b08c5d3cf9930c67c6adf23271087c3571",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d0g0v0_Frontier" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd4cb",
-                    "hash" : "0x351dd5f74e60c8feab4b9e9777f1221068c26a076371b2bdb7140c7883518e66",
-                    "mixHash" : "0x7b98085349eb9b9e7cf7e32b6fd5ac3cc2ada5c8b970ffc3a39cbf911f057a18",
-                    "nonce" : "0x6c07de243591737c",
+                    "gasUsed" : "0xd7f5",
+                    "hash" : "0x06c95aab72cbf84915f25b67560d74c6cfba7e99afa7c1a648e545ff51e37751",
+                    "mixHash" : "0x1e5a29c3c9f47f5e0d3aa9164d4694a7a51f5747ed97ace79ab045855b7b01cd",
+                    "nonce" : "0x6d2f5007f2967f4a",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
-                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
+                    "receiptTrie" : "0xeec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695a",
+                    "stateRoot" : "0xcfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a07b98085349eb9b9e7cf7e32b6fd5ac3cc2ada5c8b970ffc3a39cbf911f057a18886c07de243591737cf885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0eec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d7f58203e880a01e5a29c3c9f47f5e0d3aa9164d4694a7a51f5747ed97ace79ab045855b7b01cd886d2f5007f2967f4af885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000f01c",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x351dd5f74e60c8feab4b9e9777f1221068c26a076371b2bdb7140c7883518e66",
-        "network" : "Frontier",
+        "lastblockhash" : "0x06c95aab72cbf84915f25b67560d74c6cfba7e99afa7c1a648e545ff51e37751",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d4cb",
+                "balance" : "0x4563918244f4d7f5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a495",
+                "balance" : "0x0de0b6b3a761a16b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d0g0v0_Homestead" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd4cb",
-                    "hash" : "0xf20fee7744a94d951f207fe47379900171d71c72384efc312fbe1646aa11407a",
-                    "mixHash" : "0x1af97498c021014116393bafa1b6a5cf437f637654382565360568a146770abf",
-                    "nonce" : "0xf73fa0e842997b85",
+                    "gasUsed" : "0xd81d",
+                    "hash" : "0xe648a3c80dd9ccdf5cbea69ece8f878e0227bbff6a2cc9fbd314152295837137",
+                    "mixHash" : "0xd4b89197bdcc7aeb073dc8a3919767849cc27a75a1cee9fdd1567023eb5836cd",
+                    "nonce" : "0xbf74ce8da5573df6",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
-                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
+                    "receiptTrie" : "0x285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2",
+                    "stateRoot" : "0xa99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a01af97498c021014116393bafa1b6a5cf437f637654382565360568a146770abf88f73fa0e842997b85f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a0d4b89197bdcc7aeb073dc8a3919767849cc27a75a1cee9fdd1567023eb5836cd88bf74ce8da5573df6f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000f01c",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf20fee7744a94d951f207fe47379900171d71c72384efc312fbe1646aa11407a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe648a3c80dd9ccdf5cbea69ece8f878e0227bbff6a2cc9fbd314152295837137",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d4cb",
+                "balance" : "0x4563918244f4d81d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a495",
+                "balance" : "0x0de0b6b3a761a143",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d0g0v0_Metropolis" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd81d",
-                    "hash" : "0x2a28a6ea06647e4ca13552d16e6d274d8882cba40d1d78e3f0221d75cc236bbd",
-                    "mixHash" : "0x2215687e79524c3fbf0c92d5f126498caf8a446709fd9775373a98bf9b92ca67",
-                    "nonce" : "0xb0bab7c78b0c2f48",
+                    "gasUsed" : "0xd4cb",
+                    "hash" : "0xb4f6a5fd60e7a52915f6e0e03dc7b438ac0bedbb2801292ed81769d397fff966",
+                    "mixHash" : "0x8a28db045880ebe55e85f65d21a4fb87052c5d1eff2878a5a7b329b0e1ca6909",
+                    "nonce" : "0x2f19bc5bae48d514",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0xaafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7",
-                    "stateRoot" : "0xb4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7",
+                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
+                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7a0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a0aafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a02215687e79524c3fbf0c92d5f126498caf8a446709fd9775373a98bf9b92ca6788b0bab7c78b0c2f48f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a08a28db045880ebe55e85f65d21a4fb87052c5d1eff2878a5a7b329b0e1ca6909882f19bc5bae48d514f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000f01c",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a28a6ea06647e4ca13552d16e6d274d8882cba40d1d78e3f0221d75cc236bbd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb4f6a5fd60e7a52915f6e0e03dc7b438ac0bedbb2801292ed81769d397fff966",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d4cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a495",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecoverV_prefixedf0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd4cb",
+                    "hash" : "0x744943f297e097909e619f912acccb1b64b0edda1f6a47e8cf2872f61998472a",
+                    "mixHash" : "0x6a7b497a4e903b7ca82bc970d89d4095d11a0a5b6ce370fd3b2d3e7edd29999d",
+                    "nonce" : "0x1ed62249da625629",
+                    "number" : "0x01",
+                    "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
+                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
+                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca0f3a5a0a3d94ea506efb83a5837d753d1d922ccd7eef983655ff949494aaeaa76a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a06a7b497a4e903b7ca82bc970d89d4095d11a0a5b6ce370fd3b2d3e7edd29999d881ed62249da625629f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a0000000000000000000000000000000000000000000000000000000000000f01c1ba076daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732a029c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000f01c",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76daa7f541b2399e9eb3c079cc9f85d129181a5989ec488b45a75fcdb452c732",
+                        "s" : "0x29c9df71561cc2f2555b2429876fecce5523717bd202c4dcdd4588d4563c417a",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x744943f297e097909e619f912acccb1b64b0edda1f6a47e8cf2872f61998472a",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d81d",
+                "balance" : "0x4563918244f4d4cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a143",
+                "balance" : "0x0de0b6b3a761a495",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0.json
index dc90fa965..6290d5a22 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEEcrecoverV_prefixedf0_d1g0v0_EIP150" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd7f5",
-                    "hash" : "0x09193bd4cfd26c4a1430197a99d6242511a0587127c248917f14a7c0ae58df42",
-                    "mixHash" : "0xfcf3e4be705a095bac72671f271db85c8744c99bb0b7d9bd7de5410618b0f18a",
-                    "nonce" : "0x6a780a3d49da0b32",
+                    "gasUsed" : "0xd81d",
+                    "hash" : "0x6ea7f8cdf83bdd16f93a5ee56c900962ed38327328df2af0a1f30aecba83a43e",
+                    "mixHash" : "0xd868ee3a27e6c7c60df362953e72d1a61a9efd09fd170d7466ac4b9c2f3daa96",
+                    "nonce" : "0x62f14fd051880d2e",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0xeec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695a",
-                    "stateRoot" : "0xcfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2",
+                    "receiptTrie" : "0xaafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7",
+                    "stateRoot" : "0xb4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0eec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d7f58203e880a0fcf3e4be705a095bac72671f271db85c8744c99bb0b7d9bd7de5410618b0f18a886a780a3d49da0b32f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0aafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a0d868ee3a27e6c7c60df362953e72d1a61a9efd09fd170d7466ac4b9c2f3daa968862f14fd051880d2ef885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000f000000000000000000000000000001c",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09193bd4cfd26c4a1430197a99d6242511a0587127c248917f14a7c0ae58df42",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6ea7f8cdf83bdd16f93a5ee56c900962ed38327328df2af0a1f30aecba83a43e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d7f5",
+                "balance" : "0x4563918244f4d81d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a16b",
+                "balance" : "0x0de0b6b3a761a143",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d1g0v0_EIP158" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd81d",
-                    "hash" : "0x3c38e5c4ba0fb8891710d8891d034b8f06989cc6c2bad9b15999b4b832c1c61a",
-                    "mixHash" : "0xebbd58f46142be3c31ae837a627cca6b3e25cfb510d1dab2468f642e281b5f6f",
-                    "nonce" : "0x1a763483e2ad0452",
+                    "hash" : "0x175061cac8c97b7e0e37d0a39a327d71994d539738143784279acb4d74916919",
+                    "mixHash" : "0x23066acbb17ebf4311b01e7f10ad703290ec1ff417a9098c1628617e78c40f2c",
+                    "nonce" : "0xf7c10f24bbc04d6c",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0x285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2",
-                    "stateRoot" : "0xa99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70",
+                    "receiptTrie" : "0xaafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7",
+                    "stateRoot" : "0xb4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a0ebbd58f46142be3c31ae837a627cca6b3e25cfb510d1dab2468f642e281b5f6f881a763483e2ad0452f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0aafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a023066acbb17ebf4311b01e7f10ad703290ec1ff417a9098c1628617e78c40f2c88f7c10f24bbc04d6cf885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000f000000000000000000000000000001c",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c38e5c4ba0fb8891710d8891d034b8f06989cc6c2bad9b15999b4b832c1c61a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x175061cac8c97b7e0e37d0a39a327d71994d539738143784279acb4d74916919",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d1g0v0_Frontier" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd4cb",
-                    "hash" : "0x6b71e41af04f038269cd3f494848ef90498ce539bf890e6256d498fff92f44a6",
-                    "mixHash" : "0x79b1500bb04f402112e722c1d3f26c9e48e61084677b8a6a0c5ef5f987c02f67",
-                    "nonce" : "0x880417cc89e79881",
+                    "gasUsed" : "0xd7f5",
+                    "hash" : "0xe837a07e5357436179e5080abaf6bf1b27dc57bb7daa7a013886d2e1b6affc67",
+                    "mixHash" : "0x20a1c6cbf86fb13bfe4f6571c623cd811f93b603dda25760881515f7b33dcba1",
+                    "nonce" : "0x0d18705ce3b818fe",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
-                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
+                    "receiptTrie" : "0xeec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695a",
+                    "stateRoot" : "0xcfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a079b1500bb04f402112e722c1d3f26c9e48e61084677b8a6a0c5ef5f987c02f6788880417cc89e79881f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfde5eed57427fa5dbfceace7fc72548c1a9835b436d53731c169520760493b2a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0eec56eb7b9eeb100f05cfd2f293407dc4ec8ec65c1efdff9a931116a3e5d695ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d7f58203e880a020a1c6cbf86fb13bfe4f6571c623cd811f93b603dda25760881515f7b33dcba1880d18705ce3b818fef885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000f000000000000000000000000000001c",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b71e41af04f038269cd3f494848ef90498ce539bf890e6256d498fff92f44a6",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe837a07e5357436179e5080abaf6bf1b27dc57bb7daa7a013886d2e1b6affc67",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d4cb",
+                "balance" : "0x4563918244f4d7f5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a495",
+                "balance" : "0x0de0b6b3a761a16b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d1g0v0_Homestead" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd4cb",
-                    "hash" : "0x0c3f51f3d91ce78ffc8c8ab80eed1394f3a72517fbcbaa4ead226e3d6533c3b7",
-                    "mixHash" : "0x13cd9df859eff77e57a83b9e6024e065a68e63c9bbe8ecb4c68f52f78fad79e6",
-                    "nonce" : "0xdc5f4a4b114f3958",
+                    "gasUsed" : "0xd81d",
+                    "hash" : "0xacefff763c725427a63d6df55601ca8dbe7a0237454eb5097085a14ebe5fda86",
+                    "mixHash" : "0x9178cd85db253aaca0136bfbe5b0b99a20af6a8890f88c4ebc42f43254e3e5dd",
+                    "nonce" : "0x6258a87f809caa7c",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
-                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
+                    "receiptTrie" : "0x285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2",
+                    "stateRoot" : "0xa99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a013cd9df859eff77e57a83b9e6024e065a68e63c9bbe8ecb4c68f52f78fad79e688dc5f4a4b114f3958f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a99964163fee79214050593e3e1a873234a5712d06fd42553d2af91da532ba70a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0285c08e5ab317d9d297966b4608cf5817c399d2cbd8b54395cbd4a5bc667eac2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a09178cd85db253aaca0136bfbe5b0b99a20af6a8890f88c4ebc42f43254e3e5dd886258a87f809caa7cf885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000f000000000000000000000000000001c",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c3f51f3d91ce78ffc8c8ab80eed1394f3a72517fbcbaa4ead226e3d6533c3b7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xacefff763c725427a63d6df55601ca8dbe7a0237454eb5097085a14ebe5fda86",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d4cb",
+                "balance" : "0x4563918244f4d81d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a495",
+                "balance" : "0x0de0b6b3a761a143",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CALLCODEEcrecoverV_prefixedf0_d1g0v0_Metropolis" : {
+    "CALLCODEEcrecoverV_prefixedf0_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/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd81d",
-                    "hash" : "0xb47aac48596d28d9786ff0eb503a91c2dec9cef91d01a5f4095c22d266c365c5",
-                    "mixHash" : "0x39c99b59dd28fcadd3c8a8788428d2454939176e4834cd0986ec3f0a5b39210c",
-                    "nonce" : "0x733cfc0fac992302",
+                    "gasUsed" : "0xd4cb",
+                    "hash" : "0x500ccdb7413495c53b90ce875017038998ae4acce8635f95089104b6cde1da2d",
+                    "mixHash" : "0x447fedcfd7423a610e60f3263f0ca97043e2e7bb5f9531f5f4d350e40216e7ae",
+                    "nonce" : "0xc952a4fc5891e091",
                     "number" : "0x01",
                     "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
-                    "receiptTrie" : "0xaafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7",
-                    "stateRoot" : "0xb4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7",
+                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
+                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4886327d705fba5ace8bdda211ee87410b2b0835e119f0484a8114339260ec7a00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a0aafdad121676930f506d23ce111279197f07ea87889840fe4037746c967fffb7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d81d8203e880a039c99b59dd28fcadd3c8a8788428d2454939176e4834cd0986ec3f0a5b39210c88733cfc0fac992302f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a0447fedcfd7423a610e60f3263f0ca97043e2e7bb5f9531f5f4d350e40216e7ae88c952a4fc5891e091f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000f000000000000000000000000000001c",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb47aac48596d28d9786ff0eb503a91c2dec9cef91d01a5f4095c22d266c365c5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x500ccdb7413495c53b90ce875017038998ae4acce8635f95089104b6cde1da2d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d4cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a495",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEEcrecoverV_prefixedf0_d1g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd4cb",
+                    "hash" : "0xd715c158770df863d9c95468a7bf03d9e8647af34fb531a77b72150fef566b3b",
+                    "mixHash" : "0x0030791c08aac61e71348e01c774b27fa1a2aa653afd80e72349bb4be27ace48",
+                    "nonce" : "0xfed72583ce493d91",
+                    "number" : "0x01",
+                    "parentHash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
+                    "receiptTrie" : "0x6b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5",
+                    "stateRoot" : "0xfa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90282f901f7a0de8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa4e78acd8e6b7e1f7d8c623c3a901952b9bd9847a7a143c4bcd5623c600fb6ca00eee1a076a0883e9af0ba27f9d3133f02122c5cf7d79c8dfcf6c4e3627a63463a06b69a0a84be1779c18a0c131e98b72c9c2ca1d076418dd83dcd3a0852673fef5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d4cb8203e880a00030791c08aac61e71348e01c774b27fa1a2aa653afd80e72349bb4be27ace4888fed72583ce493d91f885f88380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0a000000000000000000000000000000000f000000000000000000000000000001c1ba09dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281ea063640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486ccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000f000000000000000000000000000001c",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dfc2815b6dad96a9a2fd7b20bfbb62eb7990a2e82ebc4ff9b6595ffc9e0281e",
+                        "s" : "0x63640a6fba2af6b867d9f740ca6a80fd3a0ccf50bd8c62f86942509f934486cc",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xde8784cd76ccf88490e94beccc34f5cdc5e340765d559de40070228cb5436f71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b22e9d463810335c3c801206424fd8ea93da140287e6a9b7eb763fc698a6c592a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd715c158770df863d9c95468a7bf03d9e8647af34fb531a77b72150fef566b3b",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d81d",
+                "balance" : "0x4563918244f4d4cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a143",
+                "balance" : "0x0de0b6b3a761a495",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0.json
index e72de80ed..30723bf4a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentitiy_0_d0g0v0_EIP150" : {
+    "CALLCODEIdentitiy_0_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/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa320",
-                    "hash" : "0x743e240aa23824c2b887ce1c846ef3cc2a12d42e2290ec367f01489caa0d3ce5",
-                    "mixHash" : "0xb134aa5bb36c5fdf22c69e53d74f11e3771a7c29c846b7234393fe24cab0bffc",
-                    "nonce" : "0xd194b5d12584aca6",
+                    "hash" : "0x905c64d8f84139c25f0ce89caff25197ba5030f29672bdb1578629976bcf0541",
+                    "mixHash" : "0xed261ed38be11ba6a7a4527098e5e0269277671d93e83b220c9e5de75da04eb8",
+                    "nonce" : "0x6c83df734c65d101",
                     "number" : "0x01",
                     "parentHash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
-                    "receiptTrie" : "0x48f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783",
-                    "stateRoot" : "0x0aa9b9c8471845d0dfb345b472050323b5c4721738503a5143e41a47075b00ad",
+                    "receiptTrie" : "0x4cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748",
+                    "stateRoot" : "0x1a4fbe5f650aaee5915945be1264a075bbfc38a6c54f9f67b3bd5f4c0568545f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa9b9c8471845d0dfb345b472050323b5c4721738503a5143e41a47075b00ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba048f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0b134aa5bb36c5fdf22c69e53d74f11e3771a7c29c846b7234393fe24cab0bffc88d194b5d12584aca6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a4fbe5f650aaee5915945be1264a075bbfc38a6c54f9f67b3bd5f4c0568545fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0ed261ed38be11ba6a7a4527098e5e0269277671d93e83b220c9e5de75da04eb8886c83df734c65d101f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x743e240aa23824c2b887ce1c846ef3cc2a12d42e2290ec367f01489caa0d3ce5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x905c64d8f84139c25f0ce89caff25197ba5030f29672bdb1578629976bcf0541",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600460fff2600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_0_d0g0v0_EIP158" : {
+    "CALLCODEIdentitiy_0_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/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa320",
-                    "hash" : "0x266580a3e783431ff6b4bdcdecab360079c481ff3345826c4988b367e638e1bb",
-                    "mixHash" : "0x4837f03de54dd1f74c66b3138a764227dbe8d9ad10ba3051933ce68735ea21af",
-                    "nonce" : "0x13363c4889a5d3a2",
+                    "hash" : "0xdc4b4bf022d43fc9712f065cd3f5639f3dc03a0775c612ed2191bd2bf78b3caa",
+                    "mixHash" : "0x4f599de139ddfc98fda4d5ef450e7c75ce8f8a47cf423d25eb2b27376f9d2f7a",
+                    "nonce" : "0x55f1a88f34339dc2",
+                    "number" : "0x01",
+                    "parentHash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
+                    "receiptTrie" : "0x4cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748",
+                    "stateRoot" : "0x1a4fbe5f650aaee5915945be1264a075bbfc38a6c54f9f67b3bd5f4c0568545f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a4fbe5f650aaee5915945be1264a075bbfc38a6c54f9f67b3bd5f4c0568545fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a04f599de139ddfc98fda4d5ef450e7c75ce8f8a47cf423d25eb2b27376f9d2f7a8855f1a88f34339dc2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc4b4bf022d43fc9712f065cd3f5639f3dc03a0775c612ed2191bd2bf78b3caa",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x600160005260206000602060006000600460fff2600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a320",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d640",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x600160005260206000602060006000600460fff2600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentitiy_0_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xa320",
+                    "hash" : "0xdefcffe9a696d05afea6b00005934017c02df225f38a2dfbd7d92b70966be44f",
+                    "mixHash" : "0x09aceea9d0f56c084d0ba783bb2bd84f41f772f4696231d081c9f0b09582d1ac",
+                    "nonce" : "0x5ca2f2289e41bacb",
                     "number" : "0x01",
                     "parentHash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
                     "receiptTrie" : "0x48f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa9b9c8471845d0dfb345b472050323b5c4721738503a5143e41a47075b00ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba048f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a04837f03de54dd1f74c66b3138a764227dbe8d9ad10ba3051933ce68735ea21af8813363c4889a5d3a2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa9b9c8471845d0dfb345b472050323b5c4721738503a5143e41a47075b00ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba048f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a009aceea9d0f56c084d0ba783bb2bd84f41f772f4696231d081c9f0b09582d1ac885ca2f2289e41bacbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x266580a3e783431ff6b4bdcdecab360079c481ff3345826c4988b367e638e1bb",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdefcffe9a696d05afea6b00005934017c02df225f38a2dfbd7d92b70966be44f",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_0_d0g0v0_Frontier" : {
+    "CALLCODEIdentitiy_0_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/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa08c",
-                    "hash" : "0xce91a18153bbc54bbc4086739aabd3e1822e8fc1a6a334971ff117c75cccbfbe",
-                    "mixHash" : "0xe48199dbe9feb2ca351b062fd9f0e0177a5d4b1d86a57138258af5aeb279ba35",
-                    "nonce" : "0x13635c8b4e00eb22",
+                    "gasUsed" : "0xa320",
+                    "hash" : "0xb26514ff475c0b5d30b2978d4ee429f0b47199e8d41b6e2b708eb9c76b7680c8",
+                    "mixHash" : "0xaab33fb255ecf37ed7b85a9dea02e809bb958a5505729badf46d3a9d0b8414a6",
+                    "nonce" : "0x9cec1027f7916b24",
                     "number" : "0x01",
                     "parentHash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
-                    "receiptTrie" : "0x3afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9c",
-                    "stateRoot" : "0x2cc36db4513e9d40d217e84904d84b3400d46565b5b3050e5457c619833cbc77",
+                    "receiptTrie" : "0x48f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783",
+                    "stateRoot" : "0x0aa9b9c8471845d0dfb345b472050323b5c4721738503a5143e41a47075b00ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cc36db4513e9d40d217e84904d84b3400d46565b5b3050e5457c619833cbc77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08c8203e880a0e48199dbe9feb2ca351b062fd9f0e0177a5d4b1d86a57138258af5aeb279ba358813635c8b4e00eb22f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa9b9c8471845d0dfb345b472050323b5c4721738503a5143e41a47075b00ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba048f5a9d9f24b69780968364d721023fd50fc616c039ec888411bf6bc35488783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0aab33fb255ecf37ed7b85a9dea02e809bb958a5505729badf46d3a9d0b8414a6889cec1027f7916b24f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce91a18153bbc54bbc4086739aabd3e1822e8fc1a6a334971ff117c75cccbfbe",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb26514ff475c0b5d30b2978d4ee429f0b47199e8d41b6e2b708eb9c76b7680c8",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a08c",
+                "balance" : "0x4563918244f4a320",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8d4",
+                "balance" : "0x0de0b6b3a761d640",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_0_d0g0v0_Homestead" : {
+    "CALLCODEIdentitiy_0_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/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0x2ee06f08ba53ab1d55c94cdf74f5adc6b000ba3ebf12fe220ebdd94bd6a69d7e",
-                    "mixHash" : "0x17100a037530cdaaef40935ee6b4f51ba9deb8ed64bc4ce76d2113c1b9b5e61f",
-                    "nonce" : "0x38614d25d1b99dda",
+                    "hash" : "0x53517b0be6f891f7a653514a5182c8517227ad3c020d29bcb73cbf02a998447d",
+                    "mixHash" : "0xd8061d2a19f6805b1b0d4509da113167b0704ec7f04267681ce685860b5b50e9",
+                    "nonce" : "0x0a6a1c2c5879b9df",
                     "number" : "0x01",
                     "parentHash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
                     "receiptTrie" : "0x3afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9c",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cc36db4513e9d40d217e84904d84b3400d46565b5b3050e5457c619833cbc77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08c8203e880a017100a037530cdaaef40935ee6b4f51ba9deb8ed64bc4ce76d2113c1b9b5e61f8838614d25d1b99ddaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cc36db4513e9d40d217e84904d84b3400d46565b5b3050e5457c619833cbc77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08c8203e880a0d8061d2a19f6805b1b0d4509da113167b0704ec7f04267681ce685860b5b50e9880a6a1c2c5879b9dff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ee06f08ba53ab1d55c94cdf74f5adc6b000ba3ebf12fe220ebdd94bd6a69d7e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x53517b0be6f891f7a653514a5182c8517227ad3c020d29bcb73cbf02a998447d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_0_d0g0v0_Metropolis" : {
+    "CALLCODEIdentitiy_0_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/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa320",
-                    "hash" : "0x9214dd324492093dfb41b2b85f0c88c80da44fae4dc73e47d98eeaef0917dba1",
-                    "mixHash" : "0x016009df9e6d4ec8d791591717116fa7ba240f8493999bceb460e4c8479e6edc",
-                    "nonce" : "0x237f97076c20cb51",
+                    "gasUsed" : "0xa08c",
+                    "hash" : "0xd9f16eb502ae1390e1f13a6865b49c62a36a27ee27635473913528e7d03f4b9f",
+                    "mixHash" : "0x43487e7b2b2726687d935f1e05189804fe0074f65075a5e6a4bf14544c5ee7c1",
+                    "nonce" : "0x9fa0ebb993e06bb3",
                     "number" : "0x01",
                     "parentHash" : "0xe59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70",
-                    "receiptTrie" : "0x4cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748",
-                    "stateRoot" : "0x1a4fbe5f650aaee5915945be1264a075bbfc38a6c54f9f67b3bd5f4c0568545f",
+                    "receiptTrie" : "0x3afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9c",
+                    "stateRoot" : "0x2cc36db4513e9d40d217e84904d84b3400d46565b5b3050e5457c619833cbc77",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a4fbe5f650aaee5915945be1264a075bbfc38a6c54f9f67b3bd5f4c0568545fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0016009df9e6d4ec8d791591717116fa7ba240f8493999bceb460e4c8479e6edc88237f97076c20cb51f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e59c056bf2b64cb41b9b672e70c7cc5f02062647971febfe993c26c41cd4bc70a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cc36db4513e9d40d217e84904d84b3400d46565b5b3050e5457c619833cbc77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03afcdc0f623228b52667726fd61b3e164373bdc4b646a794dec6bccb232c6b9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08c8203e880a043487e7b2b2726687d935f1e05189804fe0074f65075a5e6a4bf14544c5ee7c1889fa0ebb993e06bb3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06870a3aa7444d494bbd6afb1a0065903cbee79afd3d1a0133f2feedc29450d1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9214dd324492093dfb41b2b85f0c88c80da44fae4dc73e47d98eeaef0917dba1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd9f16eb502ae1390e1f13a6865b49c62a36a27ee27635473913528e7d03f4b9f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600460fff2600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a320",
+                "balance" : "0x4563918244f4a08c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d640",
+                "balance" : "0x0de0b6b3a761d8d4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0.json
index baebb18db..39bb348b6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentitiy_1_d0g0v0_EIP150" : {
+    "CALLCODEIdentitiy_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb69f",
-                    "hash" : "0xd12ce53b9d8323dcdf80557d82948765404aa473a47023080fe6cb19d25d48a6",
-                    "mixHash" : "0x085358385191aff1e681265652e448f4a1cb33dd169450cd27285c4b7dbe5820",
-                    "nonce" : "0x44cd442d367741dd",
+                    "hash" : "0x145f0a8a8fac783c0910f1251dc65518dc4f5b85c5acf6eb7cb451712072fc28",
+                    "mixHash" : "0xd70be13551428118de2bbf5a7a45d5b7f98d8be61217d234ad97157a339ad667",
+                    "nonce" : "0x1817b380399795f1",
                     "number" : "0x01",
                     "parentHash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
-                    "receiptTrie" : "0x36d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79ba",
-                    "stateRoot" : "0x2839d4ca2e042563ef3f9094e11cae7a8367096cfee28496e6b36421e9c36b69",
+                    "receiptTrie" : "0x8303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863",
+                    "stateRoot" : "0x3c615de2bc84ad71425dd0f2c0230f71bf4f70c97bca059d5b16ab1385fb90d7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02839d4ca2e042563ef3f9094e11cae7a8367096cfee28496e6b36421e9c36b69a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba036d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a0085358385191aff1e681265652e448f4a1cb33dd169450cd27285c4b7dbe58208844cd442d367741ddf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c615de2bc84ad71425dd0f2c0230f71bf4f70c97bca059d5b16ab1385fb90d7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a0d70be13551428118de2bbf5a7a45d5b7f98d8be61217d234ad97157a339ad667881817b380399795f1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd12ce53b9d8323dcdf80557d82948765404aa473a47023080fe6cb19d25d48a6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x145f0a8a8fac783c0910f1251dc65518dc4f5b85c5acf6eb7cb451712072fc28",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x6020600060006000600060046101f4f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_1_d0g0v0_EIP158" : {
+    "CALLCODEIdentitiy_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb69f",
-                    "hash" : "0xa5542bd46d51c74ab7fd34668503186b033a7ef2608a4e11dda54821818f8606",
-                    "mixHash" : "0x75f8710f4caadd9b5c560ca346f14ae9347d0514141173b80de661b77cc5aee7",
-                    "nonce" : "0x4ebdcb0c9dde3ca9",
+                    "hash" : "0xa3adf10ef1e42db7940a3c0b187eb069ef4cde773b98b9c5b746065816c7c05b",
+                    "mixHash" : "0xac5bfe9911f2a536b99882d18a77196c29c451b03cd623e220e70bbe33bf2fc1",
+                    "nonce" : "0x090a3a7a2d2cb1e4",
+                    "number" : "0x01",
+                    "parentHash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
+                    "receiptTrie" : "0x8303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863",
+                    "stateRoot" : "0x3c615de2bc84ad71425dd0f2c0230f71bf4f70c97bca059d5b16ab1385fb90d7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c615de2bc84ad71425dd0f2c0230f71bf4f70c97bca059d5b16ab1385fb90d7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a0ac5bfe9911f2a536b99882d18a77196c29c451b03cd623e220e70bbe33bf2fc188090a3a7a2d2cb1e4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bad",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa3adf10ef1e42db7940a3c0b187eb069ef4cde773b98b9c5b746065816c7c05b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x6020600060006000600060046101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b69f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761c2c1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x6020600060006000600060046101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentitiy_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xb69f",
+                    "hash" : "0x822d3b6f29ef2d1658789ea113b6de299bca854166b2cd9249ad5b2abaa423b1",
+                    "mixHash" : "0xe1e97a6a3d6fa55154b269d1b9f4355a3bef4554e2be9ce4d59a1185ce8ebd6a",
+                    "nonce" : "0x8e7ba1181bbdb480",
                     "number" : "0x01",
                     "parentHash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
                     "receiptTrie" : "0x36d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79ba",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02839d4ca2e042563ef3f9094e11cae7a8367096cfee28496e6b36421e9c36b69a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba036d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a075f8710f4caadd9b5c560ca346f14ae9347d0514141173b80de661b77cc5aee7884ebdcb0c9dde3ca9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02839d4ca2e042563ef3f9094e11cae7a8367096cfee28496e6b36421e9c36b69a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba036d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a0e1e97a6a3d6fa55154b269d1b9f4355a3bef4554e2be9ce4d59a1185ce8ebd6a888e7ba1181bbdb480f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5542bd46d51c74ab7fd34668503186b033a7ef2608a4e11dda54821818f8606",
-        "network" : "EIP158",
+        "lastblockhash" : "0x822d3b6f29ef2d1658789ea113b6de299bca854166b2cd9249ad5b2abaa423b1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_1_d0g0v0_Frontier" : {
+    "CALLCODEIdentitiy_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb40b",
-                    "hash" : "0x16e0247015b2a9e9fb87cdb43d40cf2c03dffec36e0dd7f6c40d109fbdb04714",
-                    "mixHash" : "0x2a50cf8c6f50aca569cec2d4f2a0f2173aea2103cc3f9092d947eefbcd76eb99",
-                    "nonce" : "0x634ca9aa806a9b06",
+                    "gasUsed" : "0xb69f",
+                    "hash" : "0x3073694677955d1e26723ad2b2ed4a40b77017067fceed512c51552ce132b3a6",
+                    "mixHash" : "0x1ffc67f1e5f802971661b30c3657213d032c7adff76627cfeef631dce3f8541d",
+                    "nonce" : "0x1b4432fec78a0876",
                     "number" : "0x01",
                     "parentHash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
-                    "receiptTrie" : "0x6d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4",
-                    "stateRoot" : "0xe959fe050d3dee1582bf894d13e6511574102f2cc1578c3dab4f1f5ed8bbb1ef",
+                    "receiptTrie" : "0x36d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79ba",
+                    "stateRoot" : "0x2839d4ca2e042563ef3f9094e11cae7a8367096cfee28496e6b36421e9c36b69",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e959fe050d3dee1582bf894d13e6511574102f2cc1578c3dab4f1f5ed8bbb1efa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b40b8203e880a02a50cf8c6f50aca569cec2d4f2a0f2173aea2103cc3f9092d947eefbcd76eb9988634ca9aa806a9b06f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02839d4ca2e042563ef3f9094e11cae7a8367096cfee28496e6b36421e9c36b69a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba036d8dd383d7e45e0f02df69dd9b0ff8b524f41b9e503e072fc313a8a79ac79bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a01ffc67f1e5f802971661b30c3657213d032c7adff76627cfeef631dce3f8541d881b4432fec78a0876f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16e0247015b2a9e9fb87cdb43d40cf2c03dffec36e0dd7f6c40d109fbdb04714",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3073694677955d1e26723ad2b2ed4a40b77017067fceed512c51552ce132b3a6",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b40b",
+                "balance" : "0x4563918244f4b69f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c555",
+                "balance" : "0x0de0b6b3a761c2c1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_1_d0g0v0_Homestead" : {
+    "CALLCODEIdentitiy_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb40b",
-                    "hash" : "0xfb46b49e03ae6d77d6b75205f30a1bee8da218c4f32518124aab739b10447350",
-                    "mixHash" : "0x391428028419d4f804d25985d2a493090411a3b0e859baa1645ba15be071bbef",
-                    "nonce" : "0xfb7c4bb798f1c2e5",
+                    "hash" : "0xabf55dd4a6989d9b4ca2a6997a82a24b56632bcf47a8748f172760eb9628630b",
+                    "mixHash" : "0x2ff8d041dd1e92ffd01819596fa70b949feff3a568b6e8a9dddc1c24f69c763b",
+                    "nonce" : "0xd376a466a891b333",
                     "number" : "0x01",
                     "parentHash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
                     "receiptTrie" : "0x6d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e959fe050d3dee1582bf894d13e6511574102f2cc1578c3dab4f1f5ed8bbb1efa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b40b8203e880a0391428028419d4f804d25985d2a493090411a3b0e859baa1645ba15be071bbef88fb7c4bb798f1c2e5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e959fe050d3dee1582bf894d13e6511574102f2cc1578c3dab4f1f5ed8bbb1efa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b40b8203e880a02ff8d041dd1e92ffd01819596fa70b949feff3a568b6e8a9dddc1c24f69c763b88d376a466a891b333f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb46b49e03ae6d77d6b75205f30a1bee8da218c4f32518124aab739b10447350",
-        "network" : "Homestead",
+        "lastblockhash" : "0xabf55dd4a6989d9b4ca2a6997a82a24b56632bcf47a8748f172760eb9628630b",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODEIdentitiy_1_d0g0v0_Metropolis" : {
+    "CALLCODEIdentitiy_1_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/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb69f",
-                    "hash" : "0xc4896a0e71bb2e5cc46e4c953fab6149b3892f78406dcc9aef6f9dfb1a9b9be2",
-                    "mixHash" : "0xcd001c9ad225ed4dcf131b0606954c7b58cc69fd6fc067d2f035fd105e6eab18",
-                    "nonce" : "0xb7c313d9b15591af",
+                    "gasUsed" : "0xb40b",
+                    "hash" : "0x9fad4c249b5014ccfe2bd14ccee628533b3f68f8dc6973b66f22ca403ba5e2d7",
+                    "mixHash" : "0x2bf56c5bd7318db0c50c16b25da2b445c3392d3f5ba0f57df1d7aaa98cec34b8",
+                    "nonce" : "0xd59804dc765454cd",
                     "number" : "0x01",
                     "parentHash" : "0x1f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3",
-                    "receiptTrie" : "0x8303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863",
-                    "stateRoot" : "0x3c615de2bc84ad71425dd0f2c0230f71bf4f70c97bca059d5b16ab1385fb90d7",
+                    "receiptTrie" : "0x6d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4",
+                    "stateRoot" : "0xe959fe050d3dee1582bf894d13e6511574102f2cc1578c3dab4f1f5ed8bbb1ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c615de2bc84ad71425dd0f2c0230f71bf4f70c97bca059d5b16ab1385fb90d7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a0cd001c9ad225ed4dcf131b0606954c7b58cc69fd6fc067d2f035fd105e6eab1888b7c313d9b15591aff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a01f7903fcb851003bfee682591c5cb53fac1f395d5b91c6aa1f79ce1cdd14f0f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e959fe050d3dee1582bf894d13e6511574102f2cc1578c3dab4f1f5ed8bbb1efa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06d4da3504beb3c819c58f8d0283b0e5f925a69eb4653e68e109de142237a6ae4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b40b8203e880a02bf56c5bd7318db0c50c16b25da2b445c3392d3f5ba0f57df1d7aaa98cec34b888d59804dc765454cdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdd4f201095480365afb91f0fa9411d9828f59f750ad7fc47829bd0506730bada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4896a0e71bb2e5cc46e4c953fab6149b3892f78406dcc9aef6f9dfb1a9b9be2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9fad4c249b5014ccfe2bd14ccee628533b3f68f8dc6973b66f22ca403ba5e2d7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x6020600060006000600060046101f4f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b69f",
+                "balance" : "0x4563918244f4b40b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c2c1",
+                "balance" : "0x0de0b6b3a761c555",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0.json
index e4ae5c5b8..4a51c14da 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_1_nonzeroValue_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_1_nonzeroValue_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/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xd0cb",
-                    "hash" : "0x7ed5edc1fd5e79a9a7e1e6775f4b38eff017baff6c733514ebf224d6390b2bb7",
-                    "mixHash" : "0xfb9a4652c6d2ed3503364cace6b3e6d130354d01d4f62bb485e8390afffee286",
-                    "nonce" : "0x8ce6724da54815d1",
+                    "hash" : "0x45c7282f69a2b7f8a7c9ef4b9941f8a30419fb7182cc7d07eb807dafe9d59b27",
+                    "mixHash" : "0x47e4370940f7ba4bdc6017b0b13ac741ae24be3d0e9fce162c19fca8422e4ac5",
+                    "nonce" : "0x1c523ff8e6e77abb",
                     "number" : "0x01",
                     "parentHash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
-                    "receiptTrie" : "0x4864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7",
-                    "stateRoot" : "0x52839fb9466eda826178fd4345b1c4252a2754c9c4611ba4749c28f38e88bed7",
+                    "receiptTrie" : "0xb1c924c36a4d4c797e87b9089790156c93ac3788a51db50e9b2e8c55bb2a7ab0",
+                    "stateRoot" : "0x3ebb966a9ee01b83c0ef01974c21a5fe8e2bff3ffcf58dc15d9a64407b4a08e6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052839fb9466eda826178fd4345b1c4252a2754c9c4611ba4749c28f38e88bed7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a0fb9a4652c6d2ed3503364cace6b3e6d130354d01d4f62bb485e8390afffee286888ce6724da54815d1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ebb966a9ee01b83c0ef01974c21a5fe8e2bff3ffcf58dc15d9a64407b4a08e6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1c924c36a4d4c797e87b9089790156c93ac3788a51db50e9b2e8c55bb2a7ab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a047e4370940f7ba4bdc6017b0b13ac741ae24be3d0e9fce162c19fca8422e4ac5881c523ff8e6e77abbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ed5edc1fd5e79a9a7e1e6775f4b38eff017baff6c733514ebf224d6390b2bb7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x45c7282f69a2b7f8a7c9ef4b9941f8a30419fb7182cc7d07eb807dafe9d59b27",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
                 "code" : "0x60206000600060006013600462030d40f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEIdentity_1_nonzeroValue_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_1_nonzeroValue_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/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xd0cb",
-                    "hash" : "0x6468ccf8a72c1c7243142ec0e7213df8ce8f2b65fb2d0f6a0cb0b6bf739470af",
-                    "mixHash" : "0x3c7dccf7fe418d3ef87d804d8e4a90718e561d7a45a599aed559634322da9ed3",
-                    "nonce" : "0x187fe550e73dba94",
+                    "hash" : "0xaf16351ad9ed9f644d2bfdeb79247c9cdd13b96cb4bdbcfe5be0d780c10d31cb",
+                    "mixHash" : "0x79029bd7c5d0c68be8a4338dcf046bb77470ef492b79d42a81e41e39e44499d0",
+                    "nonce" : "0x335abd704bddc776",
+                    "number" : "0x01",
+                    "parentHash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
+                    "receiptTrie" : "0xb1c924c36a4d4c797e87b9089790156c93ac3788a51db50e9b2e8c55bb2a7ab0",
+                    "stateRoot" : "0x3ebb966a9ee01b83c0ef01974c21a5fe8e2bff3ffcf58dc15d9a64407b4a08e6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ebb966a9ee01b83c0ef01974c21a5fe8e2bff3ffcf58dc15d9a64407b4a08e6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1c924c36a4d4c797e87b9089790156c93ac3788a51db50e9b2e8c55bb2a7ab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a079029bd7c5d0c68be8a4338dcf046bb77470ef492b79d42a81e41e39e44499d088335abd704bddc776f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaf16351ad9ed9f644d2bfdeb79247c9cdd13b96cb4bdbcfe5be0d780c10d31cb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bed48a0",
+                "code" : "0x60206000600060006013600462030d40f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d0cb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a895",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bebc200",
+                "code" : "0x60206000600060006013600462030d40f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_1_nonzeroValue_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xd0cb",
+                    "hash" : "0x7ba9e3aa0e896975f93995cac1662f59df49517f896f553bf4bbada7d5424a8e",
+                    "mixHash" : "0x06f4a2cc71196d7e6dbdc5678b67234b359f82765fd71373e8198425da95c4a0",
+                    "nonce" : "0xc9bf97dc2ed8f7a7",
                     "number" : "0x01",
                     "parentHash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
                     "receiptTrie" : "0x4864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052839fb9466eda826178fd4345b1c4252a2754c9c4611ba4749c28f38e88bed7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a03c7dccf7fe418d3ef87d804d8e4a90718e561d7a45a599aed559634322da9ed388187fe550e73dba94f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052839fb9466eda826178fd4345b1c4252a2754c9c4611ba4749c28f38e88bed7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a006f4a2cc71196d7e6dbdc5678b67234b359f82765fd71373e8198425da95c4a088c9bf97dc2ed8f7a7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6468ccf8a72c1c7243142ec0e7213df8ce8f2b65fb2d0f6a0cb0b6bf739470af",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7ba9e3aa0e896975f93995cac1662f59df49517f896f553bf4bbada7d5424a8e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODEIdentity_1_nonzeroValue_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_1_nonzeroValue_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/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xce37",
-                    "hash" : "0x68a7efe5a98170d42031f098324cff7fe9b80fe7f1caa56cb63a825e6d68034d",
-                    "mixHash" : "0x6b926cfd018d9427dc8d5e65191ae7566ed887bd4b8e2042051dc6506538dfdb",
-                    "nonce" : "0x4502378610d38aed",
+                    "gasUsed" : "0xd0cb",
+                    "hash" : "0xafbf237bfdc98607f962709145940ddcc86484ca537afa50a916aa79c76817f1",
+                    "mixHash" : "0x46f6ae749a31646807818d7123250dccd3470e8e683685bcdcf03eca46910aae",
+                    "nonce" : "0x3be64f094146a4c0",
                     "number" : "0x01",
                     "parentHash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
-                    "receiptTrie" : "0x810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301",
-                    "stateRoot" : "0x463726884440c11a63b7cb3f4d7466292d0d2d2c79ee52f36cc6578420fcc60c",
+                    "receiptTrie" : "0x4864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7",
+                    "stateRoot" : "0x52839fb9466eda826178fd4345b1c4252a2754c9c4611ba4749c28f38e88bed7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0463726884440c11a63b7cb3f4d7466292d0d2d2c79ee52f36cc6578420fcc60ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ce378203e880a06b926cfd018d9427dc8d5e65191ae7566ed887bd4b8e2042051dc6506538dfdb884502378610d38aedf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052839fb9466eda826178fd4345b1c4252a2754c9c4611ba4749c28f38e88bed7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04864df2abab3c01e132abd08cc0fd9913e5056ea4323cab40fa723981e9b3dd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a046f6ae749a31646807818d7123250dccd3470e8e683685bcdcf03eca46910aae883be64f094146a4c0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68a7efe5a98170d42031f098324cff7fe9b80fe7f1caa56cb63a825e6d68034d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xafbf237bfdc98607f962709145940ddcc86484ca537afa50a916aa79c76817f1",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ce37",
+                "balance" : "0x4563918244f4d0cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ab29",
+                "balance" : "0x0de0b6b3a761a895",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODEIdentity_1_nonzeroValue_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_1_nonzeroValue_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/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xce37",
-                    "hash" : "0x81339830f56c6949835e4cede034c29e9793a5d70506f99bd084c0906ea4c708",
-                    "mixHash" : "0xb130a1422b7918283f2db913bec381f4d64bac5060d8adea67967cc142c49f35",
-                    "nonce" : "0x44502e7aca1e14be",
+                    "hash" : "0x7464e111baf40fdb5ccb7560b6b8a7d730f05d46b556cde47011cd5ba7af565c",
+                    "mixHash" : "0x991839e5e1a2c742cbe42f4b7ebd968dcdbe099c6e4be1b32615ad131ba04faf",
+                    "nonce" : "0xa32c2c3b0878c993",
                     "number" : "0x01",
                     "parentHash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
                     "receiptTrie" : "0x810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0463726884440c11a63b7cb3f4d7466292d0d2d2c79ee52f36cc6578420fcc60ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ce378203e880a0b130a1422b7918283f2db913bec381f4d64bac5060d8adea67967cc142c49f358844502e7aca1e14bef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0463726884440c11a63b7cb3f4d7466292d0d2d2c79ee52f36cc6578420fcc60ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ce378203e880a0991839e5e1a2c742cbe42f4b7ebd968dcdbe099c6e4be1b32615ad131ba04faf88a32c2c3b0878c993f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81339830f56c6949835e4cede034c29e9793a5d70506f99bd084c0906ea4c708",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7464e111baf40fdb5ccb7560b6b8a7d730f05d46b556cde47011cd5ba7af565c",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODEIdentity_1_nonzeroValue_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_1_nonzeroValue_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/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xd0cb",
-                    "hash" : "0x1a18d3b7654e9d5b1ea194a812e8d23712da2f1c2fda8c449d499c306de5fe50",
-                    "mixHash" : "0x431feff5ff486649eb7ca458981fe9658c94f8cf3921e88a8ad0cfd82dcbaa83",
-                    "nonce" : "0xe2a749b70953e0ba",
+                    "gasUsed" : "0xce37",
+                    "hash" : "0x56ef1511bd4a26fc81adc4e643b4a3ddaada56f7e542d71f7887ec8d6879ef07",
+                    "mixHash" : "0xa44aceddef06cb0905f9d7e559e2b95b1d506192ee3b6e7abddb1ab589044aa5",
+                    "nonce" : "0x09cea4529c0cdfe2",
                     "number" : "0x01",
                     "parentHash" : "0xf171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056",
-                    "receiptTrie" : "0xb1c924c36a4d4c797e87b9089790156c93ac3788a51db50e9b2e8c55bb2a7ab0",
-                    "stateRoot" : "0x3ebb966a9ee01b83c0ef01974c21a5fe8e2bff3ffcf58dc15d9a64407b4a08e6",
+                    "receiptTrie" : "0x810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301",
+                    "stateRoot" : "0x463726884440c11a63b7cb3f4d7466292d0d2d2c79ee52f36cc6578420fcc60c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ebb966a9ee01b83c0ef01974c21a5fe8e2bff3ffcf58dc15d9a64407b4a08e6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1c924c36a4d4c797e87b9089790156c93ac3788a51db50e9b2e8c55bb2a7ab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d0cb8203e880a0431feff5ff486649eb7ca458981fe9658c94f8cf3921e88a8ad0cfd82dcbaa8388e2a749b70953e0baf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f171943b10ec6efbc17ef73c6b75bfa9238a5ae7099212f74277f77af0444056a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0463726884440c11a63b7cb3f4d7466292d0d2d2c79ee52f36cc6578420fcc60ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0810812e4afcd0b2ad7f12ea9136d6514517f847c16ec038d377920013d4e5301b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ce378203e880a0a44aceddef06cb0905f9d7e559e2b95b1d506192ee3b6e7abddb1ab589044aa58809cea4529c0cdfe2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0f9c1b92c4d95d02ff26ac79b862de71664c2765625b888424ab5ab4d4e9d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a18d3b7654e9d5b1ea194a812e8d23712da2f1c2fda8c449d499c306de5fe50",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x56ef1511bd4a26fc81adc4e643b4a3ddaada56f7e542d71f7887ec8d6879ef07",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
                 "code" : "0x60206000600060006013600462030d40f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d0cb",
+                "balance" : "0x4563918244f4ce37",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a895",
+                "balance" : "0x0de0b6b3a761ab29",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0.json
index e74e90431..0fc7817a2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_2_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_2_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/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x16faebac70e25a6890f80324c4f7fe4c96d44315988cf9cd266173e7804e6ee7",
-                    "mixHash" : "0xbc9ba76b0ea5b88aa307f2f4a2b21eda792589e1a3e7be561af3fcee46e1128c",
-                    "nonce" : "0x8665145472c2f840",
+                    "hash" : "0x9874ab5d8309eea3acd960cf8791d5c381d89d602026b595be9f101e1efcab62",
+                    "mixHash" : "0x935703a95c2d9b65262b53cbbb451d0a45b7138ead6407c8a1be4051967b2632",
+                    "nonce" : "0x5f0ad9d8d5bf67df",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
-                    "receiptTrie" : "0x8ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330",
-                    "stateRoot" : "0x8b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x7d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0bc9ba76b0ea5b88aa307f2f4a2b21eda792589e1a3e7be561af3fcee46e1128c888665145472c2f840f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0935703a95c2d9b65262b53cbbb451d0a45b7138ead6407c8a1be4051967b2632885f0ad9d8d5bf67dff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16faebac70e25a6890f80324c4f7fe4c96d44315988cf9cd266173e7804e6ee7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9874ab5d8309eea3acd960cf8791d5c381d89d602026b595be9f101e1efcab62",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODEIdentity_2_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0xfeb3a1cb8a1a5e5b30b17567b3937f8f32bd8c47562ec8db313cb71047a01289",
+                    "mixHash" : "0x05ac4e9e04de1fef2e00513063cd24f7d653f9e265413a5212094231bcabb115",
+                    "nonce" : "0x8ba84d5e30b6e7cf",
+                    "number" : "0x01",
+                    "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x7d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a005ac4e9e04de1fef2e00513063cd24f7d653f9e265413a5212094231bcabb115888ba84d5e30b6e7cff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfeb3a1cb8a1a5e5b30b17567b3937f8f32bd8c47562ec8db313cb71047a01289",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf34578907f",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_2_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/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x11a8e2575b810902ee4f8a559bfdea7b5035ee1f1c628e88715ab41749ed9a8f",
-                    "mixHash" : "0x4cd21611a59f4ce5a5a308550de537971383926525a512a9ceba7fe227e34ad1",
-                    "nonce" : "0xff5743f60b8b79fb",
+                    "hash" : "0x0298a2396b119eed04861ec5ea8212261e028cfb1141cd49d7d65721b53a2dd1",
+                    "mixHash" : "0xe24ab125a528b55f77ce5e30cf4f39746e1ee72115acff954bf5fe55f0279150",
+                    "nonce" : "0x60bdd51240c57787",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
                     "receiptTrie" : "0x8ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a04cd21611a59f4ce5a5a308550de537971383926525a512a9ceba7fe227e34ad188ff5743f60b8b79fbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0e24ab125a528b55f77ce5e30cf4f39746e1ee72115acff954bf5fe55f02791508860bdd51240c57787f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11a8e2575b810902ee4f8a559bfdea7b5035ee1f1c628e88715ab41749ed9a8f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0298a2396b119eed04861ec5ea8212261e028cfb1141cd49d7d65721b53a2dd1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODEIdentity_2_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_2_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/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeeb5",
-                    "hash" : "0x94ba284217e469f97a982559b7188942a2f4f9c668639e968e6017c84731d37e",
-                    "mixHash" : "0x3d8cb8e1366723a95afb4cb700eea5d1a11f629b7c3a2829b8243ac07f711f00",
-                    "nonce" : "0xc8471ee9c1492dcd",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0xf86412f07824c8c45d44b0140bfc0661abe31ae3eae068fe9c9b558d2f542457",
+                    "mixHash" : "0xb6325eb09a0c3f9583dfb128b25ee041172bd61159e74fbe843a3f08d03ce86c",
+                    "nonce" : "0xc6d8b998265bdd15",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
-                    "receiptTrie" : "0x16fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972",
-                    "stateRoot" : "0x95dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fd",
+                    "receiptTrie" : "0x8ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330",
+                    "stateRoot" : "0x8b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a03d8cb8e1366723a95afb4cb700eea5d1a11f629b7c3a2829b8243ac07f711f0088c8471ee9c1492dcdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0b6325eb09a0c3f9583dfb128b25ee041172bd61159e74fbe843a3f08d03ce86c88c6d8b998265bdd15f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94ba284217e469f97a982559b7188942a2f4f9c668639e968e6017c84731d37e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf86412f07824c8c45d44b0140bfc0661abe31ae3eae068fe9c9b558d2f542457",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eeb5",
+                "balance" : "0x4563918244f4f149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618aab",
+                "balance" : "0x0de0b6b3a7618817",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODEIdentity_2_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_2_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/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeeb5",
-                    "hash" : "0x6dfbefb51f3a6846dc78e5174daedde5953c7c463e63e13fe1282eb30649cda0",
-                    "mixHash" : "0xfee246cf358e568590efa74ceb0dad1ccd328f954f2f72717e322363aeb8c0eb",
-                    "nonce" : "0x2c8f0278126d8089",
+                    "hash" : "0x9a734cbadb89e32b714957fcac6cf44b5cae021b23073cd2ef9a21078b53c3de",
+                    "mixHash" : "0xfcf63b08f73220ec0d00f37fb72d7875d5ea2286147fd53f55b16c28b95b563d",
+                    "nonce" : "0xe7e9f6a91e28d68f",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
                     "receiptTrie" : "0x16fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a0fee246cf358e568590efa74ceb0dad1ccd328f954f2f72717e322363aeb8c0eb882c8f0278126d8089f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a0fcf63b08f73220ec0d00f37fb72d7875d5ea2286147fd53f55b16c28b95b563d88e7e9f6a91e28d68ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6dfbefb51f3a6846dc78e5174daedde5953c7c463e63e13fe1282eb30649cda0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9a734cbadb89e32b714957fcac6cf44b5cae021b23073cd2ef9a21078b53c3de",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODEIdentity_2_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_2_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/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0x99a8817fc67df3605f985a555ce75d47c9e266a087df2e3e7a85399a215faf2d",
-                    "mixHash" : "0x0edf5392935a5b9ede7d5e862941e98885227cf39b2a8e880fd820522b3f39ef",
-                    "nonce" : "0x8505487178a2a982",
+                    "gasUsed" : "0xeeb5",
+                    "hash" : "0xefd11f78c55c20a952248434079b2614e657ecc412c04c2f2466ba6a43e9d064",
+                    "mixHash" : "0x90cb85eb76c4aa708cd9cde861ff2dd098c48a3fa7347fc24c6445a073e5a746",
+                    "nonce" : "0x42f0e58f978705d4",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x7d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147",
+                    "receiptTrie" : "0x16fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972",
+                    "stateRoot" : "0x95dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a00edf5392935a5b9ede7d5e862941e98885227cf39b2a8e880fd820522b3f39ef888505487178a2a982f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a090cb85eb76c4aa708cd9cde861ff2dd098c48a3fa7347fc24c6445a073e5a7468842f0e58f978705d4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99a8817fc67df3605f985a555ce75d47c9e266a087df2e3e7a85399a215faf2d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xefd11f78c55c20a952248434079b2614e657ecc412c04c2f2466ba6a43e9d064",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x4563918244f4eeb5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
+                "balance" : "0x0de0b6b3a7618aab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0.json
index 3742fb1c6..1e8a8398a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_3_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_3_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/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xf0c80b2806aea389200fa6c4ddf1d22594c2b57215471a4d253f31413ee1ff33",
-                    "mixHash" : "0x694104f25214bdac3654f577854f171c6395139e35a17ffc5de571c8e2e476bf",
-                    "nonce" : "0xa3ab8e0ab2f39a6c",
+                    "hash" : "0x9e4964d6f59bf7eb6b09473619b7ef3613aceeb72f96e125fc4ce3bd4c1b5211",
+                    "mixHash" : "0x3233ee33bfd259f9b93757b4486b37195f5334b3d7a96868ddf02ba04b1a74aa",
+                    "nonce" : "0x3c13b277ca9b2769",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
-                    "receiptTrie" : "0x8ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330",
-                    "stateRoot" : "0x8b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x7d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0694104f25214bdac3654f577854f171c6395139e35a17ffc5de571c8e2e476bf88a3ab8e0ab2f39a6cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a03233ee33bfd259f9b93757b4486b37195f5334b3d7a96868ddf02ba04b1a74aa883c13b277ca9b2769f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0c80b2806aea389200fa6c4ddf1d22594c2b57215471a4d253f31413ee1ff33",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9e4964d6f59bf7eb6b09473619b7ef3613aceeb72f96e125fc4ce3bd4c1b5211",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODEIdentity_3_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_3_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0xe3a893a8711ae1fe9914bdad795745ded6e8d44e18a9b1265dc3cd98e7c5f0d1",
+                    "mixHash" : "0xc382629dc59a93e14c43c4edb91323c2b49b3988b465f7c9c0b84093f2baf2cb",
+                    "nonce" : "0x799b37b8841cc1b1",
+                    "number" : "0x01",
+                    "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x7d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0c382629dc59a93e14c43c4edb91323c2b49b3988b465f7c9c0b84093f2baf2cb88799b37b8841cc1b1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe3a893a8711ae1fe9914bdad795745ded6e8d44e18a9b1265dc3cd98e7c5f0d1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf34578907f",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_3_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/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x7bc13ca6c0d83c94334f90dddf92599b76c56fe580cd272a5b41d2d98c239951",
-                    "mixHash" : "0xb36be2811da56c041af07c44a9e9452d8f59dde1ed7591230833d494e5b19028",
-                    "nonce" : "0x26c7aa9d1b8aee7d",
+                    "hash" : "0xbc01230b65b7650f0840f90be5ca66ef611025089045de2505ca805b07926b30",
+                    "mixHash" : "0x081a049b2abc0feabdce36c0df7e53a0ae7b3355e66eb438d1c2de5c1008497e",
+                    "nonce" : "0xdeeef9eb61ecab1b",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
                     "receiptTrie" : "0x8ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0b36be2811da56c041af07c44a9e9452d8f59dde1ed7591230833d494e5b190288826c7aa9d1b8aee7df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0081a049b2abc0feabdce36c0df7e53a0ae7b3355e66eb438d1c2de5c1008497e88deeef9eb61ecab1bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bc13ca6c0d83c94334f90dddf92599b76c56fe580cd272a5b41d2d98c239951",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbc01230b65b7650f0840f90be5ca66ef611025089045de2505ca805b07926b30",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODEIdentity_3_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_3_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/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeeb5",
-                    "hash" : "0x1541fd018b288a0527f3126bbfe02f4df7a2d508b4044996bea81aba9998f57e",
-                    "mixHash" : "0xf60af1f1ba3ad9d853b0d503c98f9a7081f46e67813497e006f51a7ba8d29f2f",
-                    "nonce" : "0xa7cc0142cde611e6",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x691c693a95d642f05b3b01e45a4005c41160d8b0d30437aa1c40462ec0ec7cae",
+                    "mixHash" : "0x6f45fbd35b025b15b96b456ee8944bcb1af2f92e87115f89fd31bd8eb342aa08",
+                    "nonce" : "0xbd556b4787d07bbc",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
-                    "receiptTrie" : "0x16fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972",
-                    "stateRoot" : "0x95dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fd",
+                    "receiptTrie" : "0x8ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330",
+                    "stateRoot" : "0x8b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a0f60af1f1ba3ad9d853b0d503c98f9a7081f46e67813497e006f51a7ba8d29f2f88a7cc0142cde611e6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b0a7269f06921b8f586d8fb9963c9ab78fb13db548edcf2a850c60d80805d16a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08ef82bde0a1ccd9dffbb4a82e78e1831153152189896ab6a8d8d819d5dcf5330b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a06f45fbd35b025b15b96b456ee8944bcb1af2f92e87115f89fd31bd8eb342aa0888bd556b4787d07bbcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1541fd018b288a0527f3126bbfe02f4df7a2d508b4044996bea81aba9998f57e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x691c693a95d642f05b3b01e45a4005c41160d8b0d30437aa1c40462ec0ec7cae",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eeb5",
+                "balance" : "0x4563918244f4f149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618aab",
+                "balance" : "0x0de0b6b3a7618817",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODEIdentity_3_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_3_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/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeeb5",
-                    "hash" : "0x11dc0f46eb9e76df94f69180ff2828122b8fbb38dbf179e8f5da75f2c2b6a914",
-                    "mixHash" : "0x92cb7f70b39af08a06cae31cd4241a100f3536f8cdf0649e0422358a781520a2",
-                    "nonce" : "0xfa2fb1a427d9bbb3",
+                    "hash" : "0x5bf1fa34261196210fea39fd531c5155e198e14115af4f6209cbab56f4d1f24d",
+                    "mixHash" : "0xa46b0353894aef05bde689b0cc9bb4304b013064fff22e03993c10035bc5276e",
+                    "nonce" : "0x7712e52ea06ae4e5",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
                     "receiptTrie" : "0x16fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a092cb7f70b39af08a06cae31cd4241a100f3536f8cdf0649e0422358a781520a288fa2fb1a427d9bbb3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a0a46b0353894aef05bde689b0cc9bb4304b013064fff22e03993c10035bc5276e887712e52ea06ae4e5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11dc0f46eb9e76df94f69180ff2828122b8fbb38dbf179e8f5da75f2c2b6a914",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5bf1fa34261196210fea39fd531c5155e198e14115af4f6209cbab56f4d1f24d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODEIdentity_3_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_3_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/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xb329c198dd5696965886d8a168bdc82b2b123bd4de1b161ca91e23afaf1694cb",
-                    "mixHash" : "0x643bd52c6c1c06e81889a6ea4b0e76d5804d295dadc79ef9c2407fea3c1e76f9",
-                    "nonce" : "0x10322a4b41f19f6d",
+                    "gasUsed" : "0xeeb5",
+                    "hash" : "0xddb03b4bebbfe77a71b32cc35bea31d546de1d3678a6f6631bfd052d650eaf12",
+                    "mixHash" : "0xa40c47fc541539dfe91f11510a45bbdf0d39327c1850ff211805b1f20aaf3c6b",
+                    "nonce" : "0x6ae20e0d36fd81a1",
                     "number" : "0x01",
                     "parentHash" : "0xde64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9da",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x7d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147",
+                    "receiptTrie" : "0x16fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972",
+                    "stateRoot" : "0x95dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d8a4713be619205a17d221fffaacd529a6fd962c8ec3d88f8b80de86dcdf147a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0643bd52c6c1c06e81889a6ea4b0e76d5804d295dadc79ef9c2407fea3c1e76f98810322a4b41f19f6df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0de64d39967fcd942112af35201db7d9bf2a44b4f26c0ec36e34baab97f1bd9daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095dd91bf9796f9b16514aaefd5fe3e074c63f8db0185dd4bb89abd3df46286fda098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba016fb13f19dd1f83e04a97fd96d09cfdc9374b050b45389b66bfac71a8353b972b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeb58203e880a0a40c47fc541539dfe91f11510a45bbdf0d39327c1850ff211805b1f20aaf3c6b886ae20e0d36fd81a1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07efee7ff1e0e4dcacf845d073f491ff0b99fdc3d8c9574ea974fe765fc86a8b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb329c198dd5696965886d8a168bdc82b2b123bd4de1b161ca91e23afaf1694cb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xddb03b4bebbfe77a71b32cc35bea31d546de1d3678a6f6631bfd052d650eaf12",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x4563918244f4eeb5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
+                "balance" : "0x0de0b6b3a7618aab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0.json
index 43c515583..b135c805b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_4_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_4_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/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0xab056dba300ecf052b4fc89547beb8b8070d776deccae73115a60698bb7c45f0",
-                    "mixHash" : "0xc155905e11ad62e54dc459053d4da80ebc971a610c7e6da05acbc6c1e620a777",
-                    "nonce" : "0x0457fb1f62c1f798",
+                    "hash" : "0x88beb56c407f2c259a79d73c93b0eddc74f46fa4db9311ee8aa06d2852bcc74d",
+                    "mixHash" : "0x2da0064703e2f2d04e45ffbf3975106908899e2dce831f0433acd4d6a0dca568",
+                    "nonce" : "0x594378bc489e6992",
                     "number" : "0x01",
                     "parentHash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
-                    "receiptTrie" : "0xac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24",
-                    "stateRoot" : "0xe8aef8dc44f25dcf3cf02d481c3f134e0f99bec2e78074ca8e13a1dd0046338c",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0x78c0402fd224ab7983afb4e1ee2d705f9fe62164328f59b0261779e9bd66b480",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8aef8dc44f25dcf3cf02d481c3f134e0f99bec2e78074ca8e13a1dd0046338ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0c155905e11ad62e54dc459053d4da80ebc971a610c7e6da05acbc6c1e620a777880457fb1f62c1f798f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078c0402fd224ab7983afb4e1ee2d705f9fe62164328f59b0261779e9bd66b480a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a02da0064703e2f2d04e45ffbf3975106908899e2dce831f0433acd4d6a0dca56888594378bc489e6992f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab056dba300ecf052b4fc89547beb8b8070d776deccae73115a60698bb7c45f0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x88beb56c407f2c259a79d73c93b0eddc74f46fa4db9311ee8aa06d2852bcc74d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODEIdentity_4_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_4_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x616e2a1db1b20ab26a52bdf88e84a6d5d1bc48e6768f87da28a46661a09d6595",
+                    "mixHash" : "0x1c539db68af202d9a2be9ab40ee316f9623884523f04fb9c4a9bdaa9f8088378",
+                    "nonce" : "0xb65547da553b7f09",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0x78c0402fd224ab7983afb4e1ee2d705f9fe62164328f59b0261779e9bd66b480",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078c0402fd224ab7983afb4e1ee2d705f9fe62164328f59b0261779e9bd66b480a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a01c539db68af202d9a2be9ab40ee316f9623884523f04fb9c4a9bdaa9f808837888b65547da553b7f09f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x51bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x616e2a1db1b20ab26a52bdf88e84a6d5d1bc48e6768f87da28a46661a09d6595",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f143",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761881d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_4_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/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0x33bbd8f49bdf360b6968815840dac1109ff518d117ffedd84b995ca7a6b7c52c",
-                    "mixHash" : "0x8a9f3b6977ad90de1ee044a83a1cb0e1d5edab76bdee92a8ed1e01326ce506ee",
-                    "nonce" : "0x4c592739b7614ea6",
+                    "hash" : "0x14e7eb8653ea96a941b4c7fa2f5c355ca20ed7f9e62c681de267e83f6fabd4cf",
+                    "mixHash" : "0xd449d114cf6bd5eb03424913e89bf20f14a0f92dd55804df2bd0065ad98a2608",
+                    "nonce" : "0x716081443cee27f9",
                     "number" : "0x01",
                     "parentHash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
                     "receiptTrie" : "0xac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8aef8dc44f25dcf3cf02d481c3f134e0f99bec2e78074ca8e13a1dd0046338ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a08a9f3b6977ad90de1ee044a83a1cb0e1d5edab76bdee92a8ed1e01326ce506ee884c592739b7614ea6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8aef8dc44f25dcf3cf02d481c3f134e0f99bec2e78074ca8e13a1dd0046338ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0d449d114cf6bd5eb03424913e89bf20f14a0f92dd55804df2bd0065ad98a260888716081443cee27f9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33bbd8f49bdf360b6968815840dac1109ff518d117ffedd84b995ca7a6b7c52c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x14e7eb8653ea96a941b4c7fa2f5c355ca20ed7f9e62c681de267e83f6fabd4cf",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_4_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/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeeaf",
-                    "hash" : "0x714bbdc3a44450d9193b303edcd717169b42d871256af7f076b7f5909b072c94",
-                    "mixHash" : "0x28dbecf0534af17c58cb73484646e0e42928dd8816057e51fa8ad9fa684a01b0",
-                    "nonce" : "0x1e6fdf6eddbb99cd",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x24ad067576384bb4f5e3c267e4399ba2e0dbc5923a18f2b3c45818618483d105",
+                    "mixHash" : "0x22c3f07b59eb25961673926fea3b914c030ba5c69e02605d5494d3cfc282ef37",
+                    "nonce" : "0xc3deb03a7f1193ee",
                     "number" : "0x01",
                     "parentHash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
-                    "receiptTrie" : "0x6286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226d",
-                    "stateRoot" : "0xb1b8f844cc2b2e5b6f696c97e3e569bea55ae267a3cd19ac62f1b7b5be4048af",
+                    "receiptTrie" : "0xac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24",
+                    "stateRoot" : "0xe8aef8dc44f25dcf3cf02d481c3f134e0f99bec2e78074ca8e13a1dd0046338c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1b8f844cc2b2e5b6f696c97e3e569bea55ae267a3cd19ac62f1b7b5be4048afa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a028dbecf0534af17c58cb73484646e0e42928dd8816057e51fa8ad9fa684a01b0881e6fdf6eddbb99cdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8aef8dc44f25dcf3cf02d481c3f134e0f99bec2e78074ca8e13a1dd0046338ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ac8da2c94154f1c3315cb19d0092a160513ccbd5093e3bf0e07b94f595e8cb24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a022c3f07b59eb25961673926fea3b914c030ba5c69e02605d5494d3cfc282ef3788c3deb03a7f1193eef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x714bbdc3a44450d9193b303edcd717169b42d871256af7f076b7f5909b072c94",
-        "network" : "Frontier",
+        "lastblockhash" : "0x24ad067576384bb4f5e3c267e4399ba2e0dbc5923a18f2b3c45818618483d105",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eeaf",
+                "balance" : "0x4563918244f4f143",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618ab1",
+                "balance" : "0x0de0b6b3a761881d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_4_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/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeeaf",
-                    "hash" : "0xb9c8cd6e3dc7b354d089f7558ff63fd186158debb67e920cd9b735e1c38e2c9c",
-                    "mixHash" : "0xc254e86b862264158e90bd426910928725f3d68fd7dede406cc143a6b0f28476",
-                    "nonce" : "0xf01fadb3f7f8c2b9",
+                    "hash" : "0xc89340535787ed6d720afbf95797cfd3e6199371a0c304964026193c90fcdc97",
+                    "mixHash" : "0x10a00484ba608627bd85016e76b912223118f6833e21654fb4449af21164b7b2",
+                    "nonce" : "0xa162f6e0d7a7992e",
                     "number" : "0x01",
                     "parentHash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
                     "receiptTrie" : "0x6286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226d",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1b8f844cc2b2e5b6f696c97e3e569bea55ae267a3cd19ac62f1b7b5be4048afa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0c254e86b862264158e90bd426910928725f3d68fd7dede406cc143a6b0f2847688f01fadb3f7f8c2b9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1b8f844cc2b2e5b6f696c97e3e569bea55ae267a3cd19ac62f1b7b5be4048afa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a010a00484ba608627bd85016e76b912223118f6833e21654fb4449af21164b7b288a162f6e0d7a7992ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9c8cd6e3dc7b354d089f7558ff63fd186158debb67e920cd9b735e1c38e2c9c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc89340535787ed6d720afbf95797cfd3e6199371a0c304964026193c90fcdc97",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_4_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/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf143",
-                    "hash" : "0xe6e03beebd851456f52c32592d33a07297311cea3a86fa292667d5d315c869f5",
-                    "mixHash" : "0x09ecafe8d35c123f3e3f1ea43b5d2adc8b87ef3b2dd6c613a69c8e4222886858",
-                    "nonce" : "0xf78da9fc09610811",
+                    "gasUsed" : "0xeeaf",
+                    "hash" : "0x4bdf50501f9b56bdd9abf97cc50e2c90d59f38e6f682f892ea53f6fca5fa2c2b",
+                    "mixHash" : "0x021c38cf8e1e243741af87a261c1ad35316b02ce01247f6bc9a8f5dd336080c2",
+                    "nonce" : "0xcda0701179ee89e2",
                     "number" : "0x01",
                     "parentHash" : "0x7e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94",
-                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
-                    "stateRoot" : "0x78c0402fd224ab7983afb4e1ee2d705f9fe62164328f59b0261779e9bd66b480",
+                    "receiptTrie" : "0x6286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226d",
+                    "stateRoot" : "0xb1b8f844cc2b2e5b6f696c97e3e569bea55ae267a3cd19ac62f1b7b5be4048af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078c0402fd224ab7983afb4e1ee2d705f9fe62164328f59b0261779e9bd66b480a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a009ecafe8d35c123f3e3f1ea43b5d2adc8b87ef3b2dd6c613a69c8e422288685888f78da9fc09610811f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a07e7f947f0e990082da40d1125dcd0b6427222a96c28e2fedfe02acc67dd46c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1b8f844cc2b2e5b6f696c97e3e569bea55ae267a3cd19ac62f1b7b5be4048afa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06286fa38448227f54a5095795abdef7c0ba1cc8c4fcb3aadad8c0fea1c92226db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0021c38cf8e1e243741af87a261c1ad35316b02ce01247f6bc9a8f5dd336080c288cda0701179ee89e2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051bc3a115220eed517cf4f89a88740adc8cfdab26c2ad1fc430713511cc64849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6e03beebd851456f52c32592d33a07297311cea3a86fa292667d5d315c869f5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4bdf50501f9b56bdd9abf97cc50e2c90d59f38e6f682f892ea53f6fca5fa2c2b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f143",
+                "balance" : "0x4563918244f4eeaf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761881d",
+                "balance" : "0x0de0b6b3a7618ab1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0.json
index 107606749..458eb6cfc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_4_gas17_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_4_gas17_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/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb6aa",
-                    "hash" : "0xd271771883d47f587488a1ed5304fb9eebbc6e0826bbd47694e7d76e796c6063",
-                    "mixHash" : "0xe9826e12128cc99ec66b3618357184c58bb594d42ba11c9ff574cd1b008451dd",
-                    "nonce" : "0x58d7783578b7b023",
+                    "hash" : "0x516df1d3b813361c4c111bf01f3629ecb757ec03f8bd3f372d6384e80d0c5445",
+                    "mixHash" : "0x88f3bce175f729937df0385ebba47f6c4d306887d215d169a864ee689cddffe1",
+                    "nonce" : "0x6b67dbd8cee17b3f",
                     "number" : "0x01",
                     "parentHash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
-                    "receiptTrie" : "0xa4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafe",
-                    "stateRoot" : "0x0899123235ff1caea93bd86a7c54ee9ec9e6defeaafdb120d0776ed9dcbaa331",
+                    "receiptTrie" : "0x6fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825",
+                    "stateRoot" : "0xb82ca0ff2ee2564164ca8b5eee5269b55ebd1d8487808eb0dd654c68c925cc03",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00899123235ff1caea93bd86a7c54ee9ec9e6defeaafdb120d0776ed9dcbaa331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a0e9826e12128cc99ec66b3618357184c58bb594d42ba11c9ff574cd1b008451dd8858d7783578b7b023f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b82ca0ff2ee2564164ca8b5eee5269b55ebd1d8487808eb0dd654c68c925cc03a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a088f3bce175f729937df0385ebba47f6c4d306887d215d169a864ee689cddffe1886b67dbd8cee17b3ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd271771883d47f587488a1ed5304fb9eebbc6e0826bbd47694e7d76e796c6063",
-        "network" : "EIP150",
+        "lastblockhash" : "0x516df1d3b813361c4c111bf01f3629ecb757ec03f8bd3f372d6384e80d0c5445",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas17_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_4_gas17_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/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb6aa",
-                    "hash" : "0x8e5511789fbdb3a27e97b42881206a095893debf7d157dd2c2fe0936816fdf6b",
-                    "mixHash" : "0xc358c4fa2c0fe8c3c8702fe29c1bab9e2cc35caa5838a125836c9b3db04ed8bc",
-                    "nonce" : "0x1dc24b7952eee6cd",
+                    "hash" : "0x4cd7bcf52cd5a723a17f09095f84a4e3b689a9a90a0569c0b759d45ec062e871",
+                    "mixHash" : "0x8c530b0937a1b828508b402d484a53673630c234f1abf4379f0f596e1631cb33",
+                    "nonce" : "0xc0f3fb7085684ea7",
+                    "number" : "0x01",
+                    "parentHash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
+                    "receiptTrie" : "0x6fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825",
+                    "stateRoot" : "0xb82ca0ff2ee2564164ca8b5eee5269b55ebd1d8487808eb0dd654c68c925cc03",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b82ca0ff2ee2564164ca8b5eee5269b55ebd1d8487808eb0dd654c68c925cc03a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a08c530b0937a1b828508b402d484a53673630c234f1abf4379f0f596e1631cb3388c0f3fb7085684ea7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4cd7bcf52cd5a723a17f09095f84a4e3b689a9a90a0569c0b759d45ec062e871",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b6aa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761c2b6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_4_gas17_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xb6aa",
+                    "hash" : "0xe5a760e21a7b9d9177dd358e1505abc15712db26b116731120c04699ad4dd086",
+                    "mixHash" : "0x131f31c1c14d4e3e415de13f22fcb5d57af931e25ae9270024b9759599637677",
+                    "nonce" : "0x720f4a0043c835ed",
                     "number" : "0x01",
                     "parentHash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
                     "receiptTrie" : "0xa4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafe",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00899123235ff1caea93bd86a7c54ee9ec9e6defeaafdb120d0776ed9dcbaa331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a0c358c4fa2c0fe8c3c8702fe29c1bab9e2cc35caa5838a125836c9b3db04ed8bc881dc24b7952eee6cdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00899123235ff1caea93bd86a7c54ee9ec9e6defeaafdb120d0776ed9dcbaa331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a0131f31c1c14d4e3e415de13f22fcb5d57af931e25ae9270024b975959963767788720f4a0043c835edf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e5511789fbdb3a27e97b42881206a095893debf7d157dd2c2fe0936816fdf6b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe5a760e21a7b9d9177dd358e1505abc15712db26b116731120c04699ad4dd086",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas17_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_4_gas17_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/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb416",
-                    "hash" : "0x7cf7668da11e3f2aefd4aeac2fa4c06596061c9585f8088121aaeb82003cd92f",
-                    "mixHash" : "0x9980e345526d08f61b013f53dcc995419f61cbb2d6506c3a03b8e17074df7dbf",
-                    "nonce" : "0xa176074d96808a61",
+                    "gasUsed" : "0xb6aa",
+                    "hash" : "0x3f12ffe0958114bd301a431d3232c85e3538fa67141c6b95cece324040cbe024",
+                    "mixHash" : "0x14357ca4a9567941c1542371b1d1d0c6f7006fa29bcc44065648eceb75ac7060",
+                    "nonce" : "0xcb050611441a021d",
                     "number" : "0x01",
                     "parentHash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
-                    "receiptTrie" : "0x04c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430",
-                    "stateRoot" : "0xea324a9cd631be948a7ed60628c003e8b46d1dfec1b7c71cd579dd9df5ce4181",
+                    "receiptTrie" : "0xa4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafe",
+                    "stateRoot" : "0x0899123235ff1caea93bd86a7c54ee9ec9e6defeaafdb120d0776ed9dcbaa331",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea324a9cd631be948a7ed60628c003e8b46d1dfec1b7c71cd579dd9df5ce4181a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba004c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b4168203e880a09980e345526d08f61b013f53dcc995419f61cbb2d6506c3a03b8e17074df7dbf88a176074d96808a61f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00899123235ff1caea93bd86a7c54ee9ec9e6defeaafdb120d0776ed9dcbaa331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a4127beb0a5f9f2cca3cec7465d91bca61b58421fd9ee357278cc600a596cafeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a014357ca4a9567941c1542371b1d1d0c6f7006fa29bcc44065648eceb75ac706088cb050611441a021df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cf7668da11e3f2aefd4aeac2fa4c06596061c9585f8088121aaeb82003cd92f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3f12ffe0958114bd301a431d3232c85e3538fa67141c6b95cece324040cbe024",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b416",
+                "balance" : "0x4563918244f4b6aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c54a",
+                "balance" : "0x0de0b6b3a761c2b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas17_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_4_gas17_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/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb416",
-                    "hash" : "0x0638873e6fa5025ea2510785b677f5eacde0003627243a9fbb0d968114fbfa37",
-                    "mixHash" : "0x3eb4c41ceff3f1800ee184f870773771c2c74de66b5f0a2df36bb51d4950de40",
-                    "nonce" : "0x39e828e62680310a",
+                    "hash" : "0x9886df4afd095789640f8f03f4826e83815c5e4f6c6ffc7bb83b3b492a6c2acd",
+                    "mixHash" : "0xb487ba2b9fe138bbc1ce95756458ec440ecf81799df2e7f314efca18251c9519",
+                    "nonce" : "0x73e7ce0b93d4bcf5",
                     "number" : "0x01",
                     "parentHash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
                     "receiptTrie" : "0x04c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea324a9cd631be948a7ed60628c003e8b46d1dfec1b7c71cd579dd9df5ce4181a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba004c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b4168203e880a03eb4c41ceff3f1800ee184f870773771c2c74de66b5f0a2df36bb51d4950de408839e828e62680310af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea324a9cd631be948a7ed60628c003e8b46d1dfec1b7c71cd579dd9df5ce4181a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba004c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b4168203e880a0b487ba2b9fe138bbc1ce95756458ec440ecf81799df2e7f314efca18251c95198873e7ce0b93d4bcf5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0638873e6fa5025ea2510785b677f5eacde0003627243a9fbb0d968114fbfa37",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9886df4afd095789640f8f03f4826e83815c5e4f6c6ffc7bb83b3b492a6c2acd",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas17_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_4_gas17_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/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb6aa",
-                    "hash" : "0xaa17d4dabdf52b47b5265f708611e1f643c7aa3ff67a443d68206895fba489ce",
-                    "mixHash" : "0x780815d1cc045f52ef3d04749aeb5d0415ddda25b9e55023318ee0f401f270e2",
-                    "nonce" : "0x0493002e2e94df97",
+                    "gasUsed" : "0xb416",
+                    "hash" : "0xd009370b33bef26bcc56a6c83b523a6d6a85b659b5d66205c725046a981ca4be",
+                    "mixHash" : "0xc34a99218a8bc309783362dc5d09d74126fd029a23c6a58c8439dcb835a2253e",
+                    "nonce" : "0x4bfb2fa1bf47c9dc",
                     "number" : "0x01",
                     "parentHash" : "0xfa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658a",
-                    "receiptTrie" : "0x6fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825",
-                    "stateRoot" : "0xb82ca0ff2ee2564164ca8b5eee5269b55ebd1d8487808eb0dd654c68c925cc03",
+                    "receiptTrie" : "0x04c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430",
+                    "stateRoot" : "0xea324a9cd631be948a7ed60628c003e8b46d1dfec1b7c71cd579dd9df5ce4181",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b82ca0ff2ee2564164ca8b5eee5269b55ebd1d8487808eb0dd654c68c925cc03a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a0780815d1cc045f52ef3d04749aeb5d0415ddda25b9e55023318ee0f401f270e2880493002e2e94df97f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0fa27bdbd9bce0060809751d5ba9d50d94e4886397703579626b3fddb3319658aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea324a9cd631be948a7ed60628c003e8b46d1dfec1b7c71cd579dd9df5ce4181a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba004c00deccc37363da1e188aefc2f47e066b58b6df29dc1a97eedd13780c85430b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b4168203e880a0c34a99218a8bc309783362dc5d09d74126fd029a23c6a58c8439dcb835a2253e884bfb2fa1bf47c9dcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05768c8304d8a14c7dc69860492a7c63cbaa2152c08507bf0c59fef0bf58bfe6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa17d4dabdf52b47b5265f708611e1f643c7aa3ff67a443d68206895fba489ce",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd009370b33bef26bcc56a6c83b523a6d6a85b659b5d66205c725046a981ca4be",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b6aa",
+                "balance" : "0x4563918244f4b416",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c2b6",
+                "balance" : "0x0de0b6b3a761c54a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json
index 750d680ec..b9270827b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_4_gas18_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0x307813146ce9894d02cc90613f793cb034d05bf904d31c06de1ae7f321b90e2f",
-                    "mixHash" : "0xa84117330810ddcea127f9f1afc9bb0977bf941397178dd221b337c637ba5ffc",
-                    "nonce" : "0x82f1523b92ec0098",
+                    "hash" : "0x361857add396521dc1556d9a424a85d511e08617598d1703c8e2b8dd572ce101",
+                    "mixHash" : "0x4fd8881878665b879b9599d6f465f20c5ea7af18ff1761c7b72dad82f9314c7f",
+                    "nonce" : "0x7000147642183fde",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
-                    "receiptTrie" : "0x11243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1",
-                    "stateRoot" : "0xfeb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0xf0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0a84117330810ddcea127f9f1afc9bb0977bf941397178dd221b337c637ba5ffc8882f1523b92ec0098f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a04fd8881878665b879b9599d6f465f20c5ea7af18ff1761c7b72dad82f9314c7f887000147642183fdef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x307813146ce9894d02cc90613f793cb034d05bf904d31c06de1ae7f321b90e2f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x361857add396521dc1556d9a424a85d511e08617598d1703c8e2b8dd572ce101",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_4_gas18_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x5c33633902b3b5a0093c273bad112f860beae8c70d08b9e00f5d91216c30daac",
+                    "mixHash" : "0x42d9eabbf4193a8ee6f00a43387e2e50d7342b4f59c00e1ea3d775ea32db60c8",
+                    "nonce" : "0x2e52532ea0eb46e8",
+                    "number" : "0x01",
+                    "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0xf0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a042d9eabbf4193a8ee6f00a43387e2e50d7342b4f59c00e1ea3d775ea32db60c8882e52532ea0eb46e8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5c33633902b3b5a0093c273bad112f860beae8c70d08b9e00f5d91216c30daac",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f143",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761881d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0x84407754531652576f40c252108dae61890a1803456b3ff951a9bc4ca58f6d13",
-                    "mixHash" : "0xf9cdf47f404d560bd2bace6953959de5d094477a98d580ab4dd1c194b38b6c47",
-                    "nonce" : "0xc79dc31259591029",
+                    "hash" : "0x4dd5c64e011932a7638f91d6f7d2f64eba517154d2b15c3827d5039c4703017e",
+                    "mixHash" : "0xc4d9ced2bf8e6a5dc90535c4007d2d34c2fe0a509f0ff410cb6b6f1ec639df3c",
+                    "nonce" : "0xd5f75dd0b36cd794",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
                     "receiptTrie" : "0x11243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0f9cdf47f404d560bd2bace6953959de5d094477a98d580ab4dd1c194b38b6c4788c79dc31259591029f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0c4d9ced2bf8e6a5dc90535c4007d2d34c2fe0a509f0ff410cb6b6f1ec639df3c88d5f75dd0b36cd794f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84407754531652576f40c252108dae61890a1803456b3ff951a9bc4ca58f6d13",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4dd5c64e011932a7638f91d6f7d2f64eba517154d2b15c3827d5039c4703017e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeeaf",
-                    "hash" : "0xf7e479e860cf5ec831927f0bfc780e3bfa48db7c14a37cc44a5ef11bdd2fac70",
-                    "mixHash" : "0xc2d84273ec859ebc691ff6e01b180af72a204553600761cf8581171f3422950f",
-                    "nonce" : "0xd233b126b3a8ad74",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x7d0e81e8017374b6fd3ccca7d54e10411c63e80bdd526bfa7cae83a3e41d276e",
+                    "mixHash" : "0x51c2199b3d3475822469420de6d42bf58dac35774d0824ceaa551ba4bbb754de",
+                    "nonce" : "0x24dae7f40b2e4919",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
-                    "receiptTrie" : "0x49856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7",
-                    "stateRoot" : "0x4258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12",
+                    "receiptTrie" : "0x11243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1",
+                    "stateRoot" : "0xfeb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0c2d84273ec859ebc691ff6e01b180af72a204553600761cf8581171f3422950f88d233b126b3a8ad74f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a051c2199b3d3475822469420de6d42bf58dac35774d0824ceaa551ba4bbb754de8824dae7f40b2e4919f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7e479e860cf5ec831927f0bfc780e3bfa48db7c14a37cc44a5ef11bdd2fac70",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7d0e81e8017374b6fd3ccca7d54e10411c63e80bdd526bfa7cae83a3e41d276e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eeaf",
+                "balance" : "0x4563918244f4f143",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618ab1",
+                "balance" : "0x0de0b6b3a761881d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeeaf",
-                    "hash" : "0xded45ad72add20037b29fd0054e6753cb48994f3a4e16ef3aacd0a5792e680c0",
-                    "mixHash" : "0xfd66c9a80c84ca63c04b2642337e3c452d6c319ba748d6769db14837eb196925",
-                    "nonce" : "0xe8360292b202293e",
+                    "hash" : "0x4a629a68d02514aae964aa32e6db6e8d24a76e1fb73e043dec238cc519043cca",
+                    "mixHash" : "0xd40bdf71a4267b2cda23c4aa27dc9086b0171f3e536b09da6e856fec93394ba1",
+                    "nonce" : "0xfad688a9d44ed37c",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
                     "receiptTrie" : "0x49856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0fd66c9a80c84ca63c04b2642337e3c452d6c319ba748d6769db14837eb19692588e8360292b202293ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0d40bdf71a4267b2cda23c4aa27dc9086b0171f3e536b09da6e856fec93394ba188fad688a9d44ed37cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xded45ad72add20037b29fd0054e6753cb48994f3a4e16ef3aacd0a5792e680c0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4a629a68d02514aae964aa32e6db6e8d24a76e1fb73e043dec238cc519043cca",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf143",
-                    "hash" : "0x2a41bba47184798d771437bd3e2a521c353222996138fec9d8592b523c9de8b8",
-                    "mixHash" : "0xdc0c60eafdc86733ad1261c84bace96448b6aa33e165e0c34940e7e6d954f829",
-                    "nonce" : "0x902aa62adf899b4f",
+                    "gasUsed" : "0xeeaf",
+                    "hash" : "0xd3747a6922987b75d9ac6a0bf5dc964a867ca93d8a04fa3f4473edc19bfe3370",
+                    "mixHash" : "0x73db242269f2d7d55dac9b32a852ee85505b0c6ad90ba6003158c51b1bc54bcf",
+                    "nonce" : "0x99494043589cfb79",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
-                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
-                    "stateRoot" : "0xf0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10",
+                    "receiptTrie" : "0x49856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7",
+                    "stateRoot" : "0x4258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0dc0c60eafdc86733ad1261c84bace96448b6aa33e165e0c34940e7e6d954f82988902aa62adf899b4ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a073db242269f2d7d55dac9b32a852ee85505b0c6ad90ba6003158c51b1bc54bcf8899494043589cfb79f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a41bba47184798d771437bd3e2a521c353222996138fec9d8592b523c9de8b8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd3747a6922987b75d9ac6a0bf5dc964a867ca93d8a04fa3f4473edc19bfe3370",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f143",
+                "balance" : "0x4563918244f4eeaf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761881d",
+                "balance" : "0x0de0b6b3a7618ab1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0.json
index a6acd6737..cf198527e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_5_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_5_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/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0x9bee7d2e8436e81b2b018746ee05948ae6b56125e26447036501a8d531289ff3",
-                    "mixHash" : "0xa91b217c9ef793bdd020c56e4087c0f3c7796c4e6593c5f4e6755b6ba74f2524",
-                    "nonce" : "0x19c9c297023c6395",
+                    "hash" : "0xb1f53173c779a17ee9bec40d7f4fd5f2d153c3d74a566dafa637c20fc03bb937",
+                    "mixHash" : "0xf2dce05774c9e83ca72fa9944191cefb7c0b2e290560c8b3f4a6e77e68542eea",
+                    "nonce" : "0xcdc629b57ab7eedb",
                     "number" : "0x01",
                     "parentHash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
-                    "receiptTrie" : "0xa063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2",
-                    "stateRoot" : "0x4a102822a75812053bdb3a3ba592efd59a91738563482343260e1d969e17640b",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0xaa44d54484c7213d748c521a7befa132e976c710dac9dd0d164d86a6bb304610",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a102822a75812053bdb3a3ba592efd59a91738563482343260e1d969e17640ba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0a91b217c9ef793bdd020c56e4087c0f3c7796c4e6593c5f4e6755b6ba74f25248819c9c297023c6395f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa44d54484c7213d748c521a7befa132e976c710dac9dd0d164d86a6bb304610a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0f2dce05774c9e83ca72fa9944191cefb7c0b2e290560c8b3f4a6e77e68542eea88cdc629b57ab7eedbf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bee7d2e8436e81b2b018746ee05948ae6b56125e26447036501a8d531289ff3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb1f53173c779a17ee9bec40d7f4fd5f2d153c3d74a566dafa637c20fc03bb937",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODEIdentity_5_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_5_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/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0x43ad8ce0b4613b13ba3433d2a72e18f81a59733a5ef41f3dad0489d3e210fdb5",
-                    "mixHash" : "0x50fb738091652dcaf6bd7ac392730e740c10a0f4b99cd21f2470a2eebb23701b",
-                    "nonce" : "0x33e0556a43c912d7",
+                    "hash" : "0xe7fdc397d500c1a9ef24036b24eb3b67646447327fa124029fcc74c7c02d08a1",
+                    "mixHash" : "0xd25fa8c78de3a29cfe6f21b0342fc91a81ec40a961746ca5d1e09111b6c2bc5c",
+                    "nonce" : "0xf272370205af0d7f",
+                    "number" : "0x01",
+                    "parentHash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0xaa44d54484c7213d748c521a7befa132e976c710dac9dd0d164d86a6bb304610",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa44d54484c7213d748c521a7befa132e976c710dac9dd0d164d86a6bb304610a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0d25fa8c78de3a29cfe6f21b0342fc91a81ec40a961746ca5d1e09111b6c2bc5c88f272370205af0d7ff865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe7fdc397d500c1a9ef24036b24eb3b67646447327fa124029fcc74c7c02d08a1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182451341b8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a74337a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_5_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0x56ae847b9816e5c1a94599a82ccf743575d5b3d1c2c0e3f7638d46b86c546802",
+                    "mixHash" : "0x216f840e7dad1f2cdf62d5fc9f7564991da808cc6b3675140881fe722bb00db4",
+                    "nonce" : "0xe36aae3aee6c5966",
                     "number" : "0x01",
                     "parentHash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
                     "receiptTrie" : "0xa063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a102822a75812053bdb3a3ba592efd59a91738563482343260e1d969e17640ba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a050fb738091652dcaf6bd7ac392730e740c10a0f4b99cd21f2470a2eebb23701b8833e0556a43c912d7f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a102822a75812053bdb3a3ba592efd59a91738563482343260e1d969e17640ba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0216f840e7dad1f2cdf62d5fc9f7564991da808cc6b3675140881fe722bb00db488e36aae3aee6c5966f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43ad8ce0b4613b13ba3433d2a72e18f81a59733a5ef41f3dad0489d3e210fdb5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x56ae847b9816e5c1a94599a82ccf743575d5b3d1c2c0e3f7638d46b86c546802",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODEIdentity_5_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_5_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/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f3f24",
-                    "hash" : "0x902a0bd51a078f584d92f9a112c21e4f9629820331dba9867c3d5dd05b58fc26",
-                    "mixHash" : "0x02e3b39eceb1407b7a34c355994080649567bbdde0e0e7518143be50a41dabcb",
-                    "nonce" : "0x143501deccde7cb3",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0x1db8ba45011dbf8b8b40864fa5fd0b6af1f3dff380a920725e736067ba3ac0a0",
+                    "mixHash" : "0xf02cdca72005c1fffa93d8c1203d7184423174a0ad84e0b5bcc80a77202fa7ec",
+                    "nonce" : "0x15dbef5de86b763d",
                     "number" : "0x01",
                     "parentHash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
-                    "receiptTrie" : "0xa7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910",
-                    "stateRoot" : "0xb46b8a6e4f71081e4abfd52433b1b0e684d75a70c8d79993c0c94205cb90e9e3",
+                    "receiptTrie" : "0xa063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2",
+                    "stateRoot" : "0x4a102822a75812053bdb3a3ba592efd59a91738563482343260e1d969e17640b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46b8a6e4f71081e4abfd52433b1b0e684d75a70c8d79993c0c94205cb90e9e3a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a002e3b39eceb1407b7a34c355994080649567bbdde0e0e7518143be50a41dabcb88143501deccde7cb3f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a102822a75812053bdb3a3ba592efd59a91738563482343260e1d969e17640ba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a063480326f8d3e0953a9cdc6b54e78f18c11c8b908bd27bffb425d7ce2e59f2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0f02cdca72005c1fffa93d8c1203d7184423174a0ad84e0b5bcc80a77202fa7ec8815dbef5de86b763df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x902a0bd51a078f584d92f9a112c21e4f9629820331dba9867c3d5dd05b58fc26",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1db8ba45011dbf8b8b40864fa5fd0b6af1f3dff380a920725e736067ba3ac0a0",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245133f24",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7433a3c",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODEIdentity_5_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_5_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/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f3f24",
-                    "hash" : "0x8014bf466c80a3e56a2555bc3d086094c09727d9d94e02dd4281e3dd09400896",
-                    "mixHash" : "0x71bf642c62941a670cffcf8fb3144809f42736ef39ae98c12ec2536668e469cb",
-                    "nonce" : "0x502386613de81547",
+                    "hash" : "0x41427a154bac4f44cf2f657ed173f18fc25277ff787d855295c7d0b842790180",
+                    "mixHash" : "0x51214c8f85ebe398c34bc77fe14b73cc4787e67cb60637771cdbb6147da2f17c",
+                    "nonce" : "0x14288173f903af3b",
                     "number" : "0x01",
                     "parentHash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
                     "receiptTrie" : "0xa7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46b8a6e4f71081e4abfd52433b1b0e684d75a70c8d79993c0c94205cb90e9e3a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a071bf642c62941a670cffcf8fb3144809f42736ef39ae98c12ec2536668e469cb88502386613de81547f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46b8a6e4f71081e4abfd52433b1b0e684d75a70c8d79993c0c94205cb90e9e3a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a051214c8f85ebe398c34bc77fe14b73cc4787e67cb60637771cdbb6147da2f17c8814288173f903af3bf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8014bf466c80a3e56a2555bc3d086094c09727d9d94e02dd4281e3dd09400896",
-        "network" : "Homestead",
+        "lastblockhash" : "0x41427a154bac4f44cf2f657ed173f18fc25277ff787d855295c7d0b842790180",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODEIdentity_5_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_5_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/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f41b8",
-                    "hash" : "0x2e32117de07088211239376bf71cc810e394cfda810406822252444be1a96879",
-                    "mixHash" : "0xfcf86e8ca959d81dc4dcb4f84a97dea1341e130bc40742ca4541e0d14e43daf3",
-                    "nonce" : "0x189bccef7102faf6",
+                    "gasUsed" : "0x1f3f24",
+                    "hash" : "0xdbc48f7d8651670476ad5359afae409187ee2dfe431391b075adae9ac780da85",
+                    "mixHash" : "0x5b6650f15a2a5faaacdcb4494023df3ccfb9a434dc0a5738305bbcec3b26b80f",
+                    "nonce" : "0x62d8e46d9517f0c7",
                     "number" : "0x01",
                     "parentHash" : "0xfe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9",
-                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
-                    "stateRoot" : "0xaa44d54484c7213d748c521a7befa132e976c710dac9dd0d164d86a6bb304610",
+                    "receiptTrie" : "0xa7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910",
+                    "stateRoot" : "0xb46b8a6e4f71081e4abfd52433b1b0e684d75a70c8d79993c0c94205cb90e9e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa44d54484c7213d748c521a7befa132e976c710dac9dd0d164d86a6bb304610a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0fcf86e8ca959d81dc4dcb4f84a97dea1341e130bc40742ca4541e0d14e43daf388189bccef7102faf6f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0fe43c39ff7fabc7ad1a68bc8baee032f8f2b97691e888c4dd799ea23805c4ff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b46b8a6e4f71081e4abfd52433b1b0e684d75a70c8d79993c0c94205cb90e9e3a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0a7c840281c62206892fadbec106f4a24a400a0381afcf483b8ffe5f61eedd910b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a05b6650f15a2a5faaacdcb4494023df3ccfb9a434dc0a5738305bbcec3b26b80f8862d8e46d9517f0c7f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d357e55fdb5d62b4ec83c89c0d74ca848029b9cbb1604078860eaa952571732aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e32117de07088211239376bf71cc810e394cfda810406822252444be1a96879",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdbc48f7d8651670476ad5359afae409187ee2dfe431391b075adae9ac780da85",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451341b8",
+                "balance" : "0x4563918245133f24",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a74337a8",
+                "balance" : "0x0de0b6b3a7433a3c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0.json
index 8611f3a67..ff5aae50f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_0_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_0_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/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa40d",
-                    "hash" : "0x7683808e4a9b10dc934cf3ea6c7d541f7b0e59eded297fc0f0a0dd83e12c5055",
-                    "mixHash" : "0x93141bdb3e14254f8b5edd87a0cdf8e571dc52fd80c7db1e7c8c5bcb684254e2",
-                    "nonce" : "0x8c162dad7a362a0a",
+                    "hash" : "0x94617b475389b941c2c472470c8d84b1bb8c17c0439b42550febb2a7148f0dca",
+                    "mixHash" : "0x17f9cdd9571945f7ef13b5aaac956ae0897e026033cd1dd4085a54524102f7ea",
+                    "nonce" : "0x1a5cabe687b4abe3",
                     "number" : "0x01",
                     "parentHash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
-                    "receiptTrie" : "0x97f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317",
-                    "stateRoot" : "0x26ba1e15f103de60ab9a21d979c5c1755df7ceda2c0c4bcad65e9bc6ab67add2",
+                    "receiptTrie" : "0x4fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286a",
+                    "stateRoot" : "0xcf17a5506657346c553657253a19a8e9b9fb5c1f285f46fc9f9f240ba03a5e0a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ba1e15f103de60ab9a21d979c5c1755df7ceda2c0c4bcad65e9bc6ab67add2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a093141bdb3e14254f8b5edd87a0cdf8e571dc52fd80c7db1e7c8c5bcb684254e2888c162dad7a362a0af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf17a5506657346c553657253a19a8e9b9fb5c1f285f46fc9f9f240ba03a5e0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a017f9cdd9571945f7ef13b5aaac956ae0897e026033cd1dd4085a54524102f7ea881a5cabe687b4abe3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7683808e4a9b10dc934cf3ea6c7d541f7b0e59eded297fc0f0a0dd83e12c5055",
-        "network" : "EIP150",
+        "lastblockhash" : "0x94617b475389b941c2c472470c8d84b1bb8c17c0439b42550febb2a7148f0dca",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600360fff2600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODERipemd160_0_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_0_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/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa40d",
-                    "hash" : "0x49f6fd65f93d6331842b73ae74ddbd6903d48dfaa01a274d6d260c62b740bc85",
-                    "mixHash" : "0x1a7ee34b4c10d543ddbd98f2a750cf2798d9a0babbf8f6b8c2b63e35a048a605",
-                    "nonce" : "0x66e55e0a1ab41f97",
+                    "hash" : "0x393c98b3b8ef5a9e85bd2911e456c71ee3d9964830bd3801f37de7e0f36237b0",
+                    "mixHash" : "0x9d5736e1ef108b86236b7adf805302e87e6d31ab36493bf1a3a32f18e81c788f",
+                    "nonce" : "0x15092fc0e3f42d68",
+                    "number" : "0x01",
+                    "parentHash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
+                    "receiptTrie" : "0x4fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286a",
+                    "stateRoot" : "0xcf17a5506657346c553657253a19a8e9b9fb5c1f285f46fc9f9f240ba03a5e0a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf17a5506657346c553657253a19a8e9b9fb5c1f285f46fc9f9f240ba03a5e0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a09d5736e1ef108b86236b7adf805302e87e6d31ab36493bf1a3a32f18e81c788f8815092fc0e3f42d68f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x393c98b3b8ef5a9e85bd2911e456c71ee3d9964830bd3801f37de7e0f36237b0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x600160005260206000602060006000600360fff2600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a40d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d553",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x600160005260206000602060006000600360fff2600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_0_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xa40d",
+                    "hash" : "0x470c9c0ff05da0581a710e6e12962092964b39159b5ca238a2adbeda4a378370",
+                    "mixHash" : "0xd8410f6060efa918ff9e8f31a71c67f14fafc82750f4e624cf0114e4b8965617",
+                    "nonce" : "0x132bf107cadc795b",
                     "number" : "0x01",
                     "parentHash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
                     "receiptTrie" : "0x97f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ba1e15f103de60ab9a21d979c5c1755df7ceda2c0c4bcad65e9bc6ab67add2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a01a7ee34b4c10d543ddbd98f2a750cf2798d9a0babbf8f6b8c2b63e35a048a6058866e55e0a1ab41f97f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ba1e15f103de60ab9a21d979c5c1755df7ceda2c0c4bcad65e9bc6ab67add2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a0d8410f6060efa918ff9e8f31a71c67f14fafc82750f4e624cf0114e4b896561788132bf107cadc795bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49f6fd65f93d6331842b73ae74ddbd6903d48dfaa01a274d6d260c62b740bc85",
-        "network" : "EIP158",
+        "lastblockhash" : "0x470c9c0ff05da0581a710e6e12962092964b39159b5ca238a2adbeda4a378370",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODERipemd160_0_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_0_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/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa179",
-                    "hash" : "0x8405fb42e6fdda81627571b001235f55fbefda3fbe41b2d1a52ba6f2aebefd86",
-                    "mixHash" : "0x011492b6a8bb08520d7d16989bb3d0ab328349e45cfe5c6e76b877c0445b7bfe",
-                    "nonce" : "0x51924276f22ef5eb",
+                    "gasUsed" : "0xa40d",
+                    "hash" : "0xd033408f8420240735e41ae349d9dffd4c204952a9424ffb0da23a41b0be1a7c",
+                    "mixHash" : "0xa5fe39ac33be0514fbb368dc169eb725f81721a5645a9e2120c12a057e7bbfab",
+                    "nonce" : "0xa6107579e2098cf8",
                     "number" : "0x01",
                     "parentHash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
-                    "receiptTrie" : "0x875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fa",
-                    "stateRoot" : "0x6e0fa12cfe69b02799daec4a3f1f1d14ef9d60feae3eaa2e6719f1d8e9184009",
+                    "receiptTrie" : "0x97f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317",
+                    "stateRoot" : "0x26ba1e15f103de60ab9a21d979c5c1755df7ceda2c0c4bcad65e9bc6ab67add2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e0fa12cfe69b02799daec4a3f1f1d14ef9d60feae3eaa2e6719f1d8e9184009a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a1798203e880a0011492b6a8bb08520d7d16989bb3d0ab328349e45cfe5c6e76b877c0445b7bfe8851924276f22ef5ebf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ba1e15f103de60ab9a21d979c5c1755df7ceda2c0c4bcad65e9bc6ab67add2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba097f7500988a0be97a3aa7c5901c173a4513c49b0dac060a81bf4a434d3040317b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a0a5fe39ac33be0514fbb368dc169eb725f81721a5645a9e2120c12a057e7bbfab88a6107579e2098cf8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8405fb42e6fdda81627571b001235f55fbefda3fbe41b2d1a52ba6f2aebefd86",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd033408f8420240735e41ae349d9dffd4c204952a9424ffb0da23a41b0be1a7c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a179",
+                "balance" : "0x4563918244f4a40d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d7e7",
+                "balance" : "0x0de0b6b3a761d553",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODERipemd160_0_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_0_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/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa179",
-                    "hash" : "0xcc24a1f8cb4218f7b9ef91ef366be79d1006372ff72913049dd1fa9f68569e79",
-                    "mixHash" : "0xc28fefc99b20be97de05e47a6c2169daa9c453fadbb36480a966595cf6e8248c",
-                    "nonce" : "0x62a035148bca38bb",
+                    "hash" : "0x567984cccc5357ad277f3bc80a8f320b086ca48ed36eaa7e94bf553cd46ecc5a",
+                    "mixHash" : "0xe058646e1efc5b22e163d4588148605ec74719c8abc6bb52734cb74b91b9b9e0",
+                    "nonce" : "0x62b34c7152385c24",
                     "number" : "0x01",
                     "parentHash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
                     "receiptTrie" : "0x875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fa",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e0fa12cfe69b02799daec4a3f1f1d14ef9d60feae3eaa2e6719f1d8e9184009a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a1798203e880a0c28fefc99b20be97de05e47a6c2169daa9c453fadbb36480a966595cf6e8248c8862a035148bca38bbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e0fa12cfe69b02799daec4a3f1f1d14ef9d60feae3eaa2e6719f1d8e9184009a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a1798203e880a0e058646e1efc5b22e163d4588148605ec74719c8abc6bb52734cb74b91b9b9e08862b34c7152385c24f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc24a1f8cb4218f7b9ef91ef366be79d1006372ff72913049dd1fa9f68569e79",
-        "network" : "Homestead",
+        "lastblockhash" : "0x567984cccc5357ad277f3bc80a8f320b086ca48ed36eaa7e94bf553cd46ecc5a",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODERipemd160_0_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_0_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/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa40d",
-                    "hash" : "0xc2f01a74c93626019ac5b0abc04fe8567b188de74d1794d154a7ebae17d5ed7a",
-                    "mixHash" : "0x79054cc230c554a31b4a999ee74ba8a6e43598c6b5a1deec3024e5f0cca4753d",
-                    "nonce" : "0x0483a67adf291257",
+                    "gasUsed" : "0xa179",
+                    "hash" : "0x7c61d4f59eb6ed0acd87570356509772415fdacc5d1303c1283be7f8b34242c3",
+                    "mixHash" : "0xeed260fa3a7ed4cc79d8e479d53d2b64074e386f3b7ac329411704c41313afeb",
+                    "nonce" : "0xe56dca5c8a3cd72b",
                     "number" : "0x01",
                     "parentHash" : "0xc0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612",
-                    "receiptTrie" : "0x4fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286a",
-                    "stateRoot" : "0xcf17a5506657346c553657253a19a8e9b9fb5c1f285f46fc9f9f240ba03a5e0a",
+                    "receiptTrie" : "0x875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fa",
+                    "stateRoot" : "0x6e0fa12cfe69b02799daec4a3f1f1d14ef9d60feae3eaa2e6719f1d8e9184009",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf17a5506657346c553657253a19a8e9b9fb5c1f285f46fc9f9f240ba03a5e0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a079054cc230c554a31b4a999ee74ba8a6e43598c6b5a1deec3024e5f0cca4753d880483a67adf291257f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c0dd826946eba82a268922d5470cceccd7ab821a65c3dd05e2637669bfe84612a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e0fa12cfe69b02799daec4a3f1f1d14ef9d60feae3eaa2e6719f1d8e9184009a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0875449ebdfa684370c464c421c2782031f1ef770ae94093e8e5a37f20f9ad8fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a1798203e880a0eed260fa3a7ed4cc79d8e479d53d2b64074e386f3b7ac329411704c41313afeb88e56dca5c8a3cd72bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5f18a7cf02b98adac4ebf76bb380a834bf1f5a38ede0b6d068c627d95d6033aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2f01a74c93626019ac5b0abc04fe8567b188de74d1794d154a7ebae17d5ed7a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7c61d4f59eb6ed0acd87570356509772415fdacc5d1303c1283be7f8b34242c3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600360fff2600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a40d",
+                "balance" : "0x4563918244f4a179",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d553",
+                "balance" : "0x0de0b6b3a761d7e7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0.json
index 3b601db82..4beefa23f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_1_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf380",
-                    "hash" : "0xe0bdc8b59e4d9d383420526550111b799fa50e37283dcf9a177cfeeb22564a28",
-                    "mixHash" : "0x9e7c6cd6849b1a675d0e779d6fb6c68297b75fd761b04bd2cc6c0b1833173fbd",
-                    "nonce" : "0x0c8dca3b7cdea905",
+                    "hash" : "0xd594e2a6ad7a1d2be34b37ecf28dfec4dbf73919ccaed700727cbaed2e7658c1",
+                    "mixHash" : "0xa1a3a729b4003582c20bd95da4c76a4dcdbec11c72a8eb2f4954cb376d83a587",
+                    "nonce" : "0x07a1242307c83ce7",
                     "number" : "0x01",
                     "parentHash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
-                    "receiptTrie" : "0xb763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685b",
-                    "stateRoot" : "0x74d12e551039fe06065bed241714dc0abb5d88a19c12b247fe77495ca32d86f6",
+                    "receiptTrie" : "0x64c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6e",
+                    "stateRoot" : "0x3c277ad756d07ffaee680e0290f92907bd09a27638cbdbfa43180c98f1f2a0a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d12e551039fe06065bed241714dc0abb5d88a19c12b247fe77495ca32d86f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a09e7c6cd6849b1a675d0e779d6fb6c68297b75fd761b04bd2cc6c0b1833173fbd880c8dca3b7cdea905f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c277ad756d07ffaee680e0290f92907bd09a27638cbdbfa43180c98f1f2a0a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0a1a3a729b4003582c20bd95da4c76a4dcdbec11c72a8eb2f4954cb376d83a5878807a1242307c83ce7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0bdc8b59e4d9d383420526550111b799fa50e37283dcf9a177cfeeb22564a28",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd594e2a6ad7a1d2be34b37ecf28dfec4dbf73919ccaed700727cbaed2e7658c1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060006000600060006003610258f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODERipemd160_1_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_1_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf380",
+                    "hash" : "0x763d51c38d4ce5d01a218a83703de969d8791d7a9eb8e1194fe713608d1baf69",
+                    "mixHash" : "0xa364d1d7e86b38557973242f722cac57bfbc10ec099d61503435a22396e5562f",
+                    "nonce" : "0x8178d19fa4f80d4b",
+                    "number" : "0x01",
+                    "parentHash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
+                    "receiptTrie" : "0x64c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6e",
+                    "stateRoot" : "0x3c277ad756d07ffaee680e0290f92907bd09a27638cbdbfa43180c98f1f2a0a2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c277ad756d07ffaee680e0290f92907bd09a27638cbdbfa43180c98f1f2a0a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0a364d1d7e86b38557973242f722cac57bfbc10ec099d61503435a22396e5562f888178d19fa4f80d4bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x763d51c38d4ce5d01a218a83703de969d8791d7a9eb8e1194fe713608d1baf69",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x602060006000600060006003610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f380",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76185e0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x602060006000600060006003610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf380",
-                    "hash" : "0xcd8be1019bf469c86b2b775ec4395692308b16037da7deb0b7f78340f463a281",
-                    "mixHash" : "0x3180f1b2b9008de9dd73a40b19b905e0877fa0faa7f8eb7f7fc28eac265d88b9",
-                    "nonce" : "0xf0e0c0f5ab3485b0",
+                    "hash" : "0x4a2635caa383118e36c8be02b062a924f33e499ba6974da125c380b96a88b691",
+                    "mixHash" : "0xcafc5d6e5fbb99ae88356449f56b00cfc7a19ee11a649b19e9142670425694e4",
+                    "nonce" : "0x2e2a09ddc5fc58dd",
                     "number" : "0x01",
                     "parentHash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
                     "receiptTrie" : "0xb763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685b",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d12e551039fe06065bed241714dc0abb5d88a19c12b247fe77495ca32d86f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a03180f1b2b9008de9dd73a40b19b905e0877fa0faa7f8eb7f7fc28eac265d88b988f0e0c0f5ab3485b0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d12e551039fe06065bed241714dc0abb5d88a19c12b247fe77495ca32d86f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0cafc5d6e5fbb99ae88356449f56b00cfc7a19ee11a649b19e9142670425694e4882e2a09ddc5fc58ddf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd8be1019bf469c86b2b775ec4395692308b16037da7deb0b7f78340f463a281",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4a2635caa383118e36c8be02b062a924f33e499ba6974da125c380b96a88b691",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODERipemd160_1_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf0ec",
-                    "hash" : "0xd841dae4811a2e49d65a20719e49933a82138b54ff6731acb06c8e734f894cfe",
-                    "mixHash" : "0x082801d5fc58d4f873e291127c2016f07181cb3d5ff623c87d6c2ec09a742a8b",
-                    "nonce" : "0x73669553616f719e",
+                    "gasUsed" : "0xf380",
+                    "hash" : "0x496159e12faaa6291e24fa6e08a9d10155a30cb9e2677a63c6ec06b8d29515f3",
+                    "mixHash" : "0x9c42dda5a8a1237548d1c962ec8f00d39ff31a59dadc3fa8c2c7bdf3e4219fc2",
+                    "nonce" : "0xf2883c318dc5cb38",
                     "number" : "0x01",
                     "parentHash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
-                    "receiptTrie" : "0xca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3",
-                    "stateRoot" : "0x2b3cd800ebcabeddde244fd8e8c91eeeaa376c596eea3775a0619fdd7f3e05a5",
+                    "receiptTrie" : "0xb763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685b",
+                    "stateRoot" : "0x74d12e551039fe06065bed241714dc0abb5d88a19c12b247fe77495ca32d86f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b3cd800ebcabeddde244fd8e8c91eeeaa376c596eea3775a0619fdd7f3e05a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f0ec8203e880a0082801d5fc58d4f873e291127c2016f07181cb3d5ff623c87d6c2ec09a742a8b8873669553616f719ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d12e551039fe06065bed241714dc0abb5d88a19c12b247fe77495ca32d86f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b763b7337317dff5c9b09ea966c7bd40349179fde7bb4f19c5300b301af3685bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a09c42dda5a8a1237548d1c962ec8f00d39ff31a59dadc3fa8c2c7bdf3e4219fc288f2883c318dc5cb38f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd841dae4811a2e49d65a20719e49933a82138b54ff6731acb06c8e734f894cfe",
-        "network" : "Frontier",
+        "lastblockhash" : "0x496159e12faaa6291e24fa6e08a9d10155a30cb9e2677a63c6ec06b8d29515f3",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f0ec",
+                "balance" : "0x4563918244f4f380",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618874",
+                "balance" : "0x0de0b6b3a76185e0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODERipemd160_1_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf0ec",
-                    "hash" : "0xec71582f21c5078e45297e08d9e6aa86eb8d295284b26e7aaca0f4cc3c2e03be",
-                    "mixHash" : "0x07eb65b0732317e5fd494de35d9cb7a8726d6293298db2873e690baad1d395a8",
-                    "nonce" : "0x04d183b222327ccb",
+                    "hash" : "0x4dd8c12d004c895a4455916757c539b4ca16132fb17db5d66f9a0b2cdbb02c51",
+                    "mixHash" : "0x86403df321fd57e573435ba12ac4771406e4010b4c4b6b6d5301d4c938976743",
+                    "nonce" : "0x83114d6e42ead63c",
                     "number" : "0x01",
                     "parentHash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
                     "receiptTrie" : "0xca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b3cd800ebcabeddde244fd8e8c91eeeaa376c596eea3775a0619fdd7f3e05a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f0ec8203e880a007eb65b0732317e5fd494de35d9cb7a8726d6293298db2873e690baad1d395a88804d183b222327ccbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b3cd800ebcabeddde244fd8e8c91eeeaa376c596eea3775a0619fdd7f3e05a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f0ec8203e880a086403df321fd57e573435ba12ac4771406e4010b4c4b6b6d5301d4c9389767438883114d6e42ead63cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec71582f21c5078e45297e08d9e6aa86eb8d295284b26e7aaca0f4cc3c2e03be",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4dd8c12d004c895a4455916757c539b4ca16132fb17db5d66f9a0b2cdbb02c51",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODERipemd160_1_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_1_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/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf380",
-                    "hash" : "0x57dd1355b01dd960e74b8b32cf3215e5eb23aa1efae22b47fa904358aa2f7bfb",
-                    "mixHash" : "0xf34649d6e537291daad19e388560210352d585ad698bc8598bf49a4a254a5f67",
-                    "nonce" : "0xab91439a5463107f",
+                    "gasUsed" : "0xf0ec",
+                    "hash" : "0x327140b27c462d656bf8079c32d04cb2c621efd8b9af535450242b2ba564e095",
+                    "mixHash" : "0xab5d9d718cadbc525ec1194f13a9546efbe88e5309226b3472980d4f5506d723",
+                    "nonce" : "0x214c8b95ddb08f20",
                     "number" : "0x01",
                     "parentHash" : "0xd280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7b",
-                    "receiptTrie" : "0x64c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6e",
-                    "stateRoot" : "0x3c277ad756d07ffaee680e0290f92907bd09a27638cbdbfa43180c98f1f2a0a2",
+                    "receiptTrie" : "0xca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3",
+                    "stateRoot" : "0x2b3cd800ebcabeddde244fd8e8c91eeeaa376c596eea3775a0619fdd7f3e05a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c277ad756d07ffaee680e0290f92907bd09a27638cbdbfa43180c98f1f2a0a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0f34649d6e537291daad19e388560210352d585ad698bc8598bf49a4a254a5f6788ab91439a5463107ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d280ae7ea25ac5b61902599a65644d4eebc8d59891714ee359e2b501f47e7e7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b3cd800ebcabeddde244fd8e8c91eeeaa376c596eea3775a0619fdd7f3e05a5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ca05e540955007561065899f5fe76d36923d44324491c5235c02c327519f87f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f0ec8203e880a0ab5d9d718cadbc525ec1194f13a9546efbe88e5309226b3472980d4f5506d72388214c8b95ddb08f20f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c096531732668596ce3ddd09ea054a15bedc7db6cfe6343428e975a9d7f92525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57dd1355b01dd960e74b8b32cf3215e5eb23aa1efae22b47fa904358aa2f7bfb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x327140b27c462d656bf8079c32d04cb2c621efd8b9af535450242b2ba564e095",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060006000600060006003610258f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f380",
+                "balance" : "0x4563918244f4f0ec",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76185e0",
+                "balance" : "0x0de0b6b3a7618874",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0.json
index 99047c841..99a681895 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_2_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_2_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/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0x520310b3f16f47e5768a55c11f90adadf4f94ed5f9fe8e927f7e1a68aaec2676",
-                    "mixHash" : "0xcf68f554ce008157b03766ff18df9061b429ae2a758c74f2b36991f26ea11588",
-                    "nonce" : "0x414d0a4bf91d5174",
+                    "hash" : "0xb17ba726b82a2f93a7e11d8bc2925a41c7ee4b6e47ecbde677e4ce485f69d393",
+                    "mixHash" : "0x1fd938b0878d76b2ede5000b5e025c34ca6b960ca5ba1b1b9d904baaf8623570",
+                    "nonce" : "0x0449dfc796f35706",
                     "number" : "0x01",
                     "parentHash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
-                    "receiptTrie" : "0x0861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3",
-                    "stateRoot" : "0x2bdba084e733c38f7480fe428ee5db4edadc425ae6d8f148f651c4f577514f9f",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x3d624f072d8fad6c9114ca61a76183e10e84ba92dc011b10567fe5ec1ead47a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bdba084e733c38f7480fe428ee5db4edadc425ae6d8f148f651c4f577514f9fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0cf68f554ce008157b03766ff18df9061b429ae2a758c74f2b36991f26ea1158888414d0a4bf91d5174f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d624f072d8fad6c9114ca61a76183e10e84ba92dc011b10567fe5ec1ead47a9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a01fd938b0878d76b2ede5000b5e025c34ca6b960ca5ba1b1b9d904baaf8623570880449dfc796f35706f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x520310b3f16f47e5768a55c11f90adadf4f94ed5f9fe8e927f7e1a68aaec2676",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb17ba726b82a2f93a7e11d8bc2925a41c7ee4b6e47ecbde677e4ce485f69d393",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600552602060006025600060006003611770f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODERipemd160_2_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0xa73cb8382c33addfa1987c5b66597936f31abf00b10c0f1c1c61f7c8f973268f",
+                    "mixHash" : "0x4c8aef41a854c974377e4cd1b9e527b6fde76d90dba23145762df87d5b4cd59b",
+                    "nonce" : "0xe76bf495b324d319",
+                    "number" : "0x01",
+                    "parentHash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x3d624f072d8fad6c9114ca61a76183e10e84ba92dc011b10567fe5ec1ead47a9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d624f072d8fad6c9114ca61a76183e10e84ba92dc011b10567fe5ec1ead47a9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a04c8aef41a854c974377e4cd1b9e527b6fde76d90dba23145762df87d5b4cd59b88e76bf495b324d319f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa73cb8382c33addfa1987c5b66597936f31abf00b10c0f1c1c61f7c8f973268f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600552602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdbc100f916bfbc53535573d98cf0cbb3a5b36124",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f600552602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_2_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/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0x2767183296c22273b7ff1c2155ff1c1c1fc1bfce455de526066b1e8231be09d3",
-                    "mixHash" : "0xd2dfad5c70bdb336b4ad2e818ca46903071a7438411739f58b5c8dfe796f89c3",
-                    "nonce" : "0xbff7306097078cfa",
+                    "hash" : "0x368bdc45373fcc7c9a919a97e3bb342ce784654a5328dafa897eaad08b592d19",
+                    "mixHash" : "0xe7f7f8b5d1a96cf140a86345826151e2419fcd73875ff15b88e6da663ea79bfc",
+                    "nonce" : "0x216bd808e3c24942",
                     "number" : "0x01",
                     "parentHash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
                     "receiptTrie" : "0x0861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bdba084e733c38f7480fe428ee5db4edadc425ae6d8f148f651c4f577514f9fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0d2dfad5c70bdb336b4ad2e818ca46903071a7438411739f58b5c8dfe796f89c388bff7306097078cfaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bdba084e733c38f7480fe428ee5db4edadc425ae6d8f148f651c4f577514f9fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0e7f7f8b5d1a96cf140a86345826151e2419fcd73875ff15b88e6da663ea79bfc88216bd808e3c24942f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2767183296c22273b7ff1c2155ff1c1c1fc1bfce455de526066b1e8231be09d3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x368bdc45373fcc7c9a919a97e3bb342ce784654a5328dafa897eaad08b592d19",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODERipemd160_2_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_2_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/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf1e8",
-                    "hash" : "0xcb4d9a0f6c71791f7f52683b21efc6d9f224b4132a505c09b5fca5c1bf2edbca",
-                    "mixHash" : "0xcb7d8c9f59207527d6640aea233e9b51bf139e94f6e8776e14155c55262f5471",
-                    "nonce" : "0x1d7e9dca36d4e0d0",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x1ceb3dc49f38e72cb598756e4c249e86e912548ee52d4de6f6bd47e52079da42",
+                    "mixHash" : "0x39f1fe75720f1f0f657baec2c95e2faa58aa59722d06feb0ba46971bc2b596f7",
+                    "nonce" : "0xfec54ce5f80de162",
                     "number" : "0x01",
                     "parentHash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
-                    "receiptTrie" : "0x249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5",
-                    "stateRoot" : "0x1ef7e6bb512da783f426a9579b22c8a952874e86c3d60f1cd146dd0700a72cf9",
+                    "receiptTrie" : "0x0861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3",
+                    "stateRoot" : "0x2bdba084e733c38f7480fe428ee5db4edadc425ae6d8f148f651c4f577514f9f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ef7e6bb512da783f426a9579b22c8a952874e86c3d60f1cd146dd0700a72cf9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0cb7d8c9f59207527d6640aea233e9b51bf139e94f6e8776e14155c55262f5471881d7e9dca36d4e0d0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bdba084e733c38f7480fe428ee5db4edadc425ae6d8f148f651c4f577514f9fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00861dc69bd7ce245166c83225533af107447235a5ee02153ada7353479e7ccd3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a039f1fe75720f1f0f657baec2c95e2faa58aa59722d06feb0ba46971bc2b596f788fec54ce5f80de162f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb4d9a0f6c71791f7f52683b21efc6d9f224b4132a505c09b5fca5c1bf2edbca",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1ceb3dc49f38e72cb598756e4c249e86e912548ee52d4de6f6bd47e52079da42",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f1e8",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618778",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODERipemd160_2_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_2_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/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf1e8",
-                    "hash" : "0xbf47cc8d616a6636d7681921d06ab320cdd2b072ff2fb01eae71b3d54c3e1abd",
-                    "mixHash" : "0x5de661b92357d01b45a88f195f238d353e6f2f9ab7d1828e24cf2c98493cc05d",
-                    "nonce" : "0xb5517ff3ad93879e",
+                    "hash" : "0x311f90505af12f24a335fbfb4d493c29bd0ec92521632cf68ed83f1ec1807820",
+                    "mixHash" : "0x180c90ad7878e061269d1797f46645c0eba0877fc03965447880a178e12fd2e0",
+                    "nonce" : "0x0ed0a2ccae5a78be",
                     "number" : "0x01",
                     "parentHash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
                     "receiptTrie" : "0x249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ef7e6bb512da783f426a9579b22c8a952874e86c3d60f1cd146dd0700a72cf9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a05de661b92357d01b45a88f195f238d353e6f2f9ab7d1828e24cf2c98493cc05d88b5517ff3ad93879ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ef7e6bb512da783f426a9579b22c8a952874e86c3d60f1cd146dd0700a72cf9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0180c90ad7878e061269d1797f46645c0eba0877fc03965447880a178e12fd2e0880ed0a2ccae5a78bef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf47cc8d616a6636d7681921d06ab320cdd2b072ff2fb01eae71b3d54c3e1abd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x311f90505af12f24a335fbfb4d493c29bd0ec92521632cf68ed83f1ec1807820",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODERipemd160_2_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_2_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/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0xfa03069dfd05b92f79b5279752fb08ececad387f025c044512ba8ff549dcdd21",
-                    "mixHash" : "0x1dbc8c633ed5db326fb506f14cb506f4470e09061414dbb06b3e460d9244c2cc",
-                    "nonce" : "0x6acf1d3457854c0f",
+                    "gasUsed" : "0xf1e8",
+                    "hash" : "0xa22283f3395baf81fa8ca4f8f7b8a191a1c8387ca5407398148977e06ab4a3de",
+                    "mixHash" : "0xce407978b992cec51bcd26997cb3bd31da90c0c6fdfc4873bf341af0b1a377e5",
+                    "nonce" : "0x072d5a8b090ad64c",
                     "number" : "0x01",
                     "parentHash" : "0xbdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x3d624f072d8fad6c9114ca61a76183e10e84ba92dc011b10567fe5ec1ead47a9",
+                    "receiptTrie" : "0x249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5",
+                    "stateRoot" : "0x1ef7e6bb512da783f426a9579b22c8a952874e86c3d60f1cd146dd0700a72cf9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d624f072d8fad6c9114ca61a76183e10e84ba92dc011b10567fe5ec1ead47a9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a01dbc8c633ed5db326fb506f14cb506f4470e09061414dbb06b3e460d9244c2cc886acf1d3457854c0ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bdc8132dd293f17bb1a4b18b528ed0c02078eed9263e99eafc2ab7de52e4ba36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ef7e6bb512da783f426a9579b22c8a952874e86c3d60f1cd146dd0700a72cf9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0249f8c9924cbcb7f600f18d6a3521e40fd3137c95b696ab528c2ce787ee779a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0ce407978b992cec51bcd26997cb3bd31da90c0c6fdfc4873bf341af0b1a377e588072d5a8b090ad64cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa73deee99777fcf6a796a2dd04cbc1a3355cce29a936c7e7a428b2fa2e0e1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa03069dfd05b92f79b5279752fb08ececad387f025c044512ba8ff549dcdd21",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa22283f3395baf81fa8ca4f8f7b8a191a1c8387ca5407398148977e06ab4a3de",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600552602060006025600060006003611770f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f4f1e8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a7618778",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0.json
index 1bd2f890b..f6700fd4e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_3_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_3_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/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0xa2c8892c5f0d114e227041f89712bd3ac93c40f509e49f20e4af8c53869ed01e",
-                    "mixHash" : "0x353eb579e141a2ca276b7e45c7fda624168984ba3b6af9f968ebedfba0671070",
-                    "nonce" : "0x012f6289758a45f3",
+                    "hash" : "0x739372448f75c3a1759b427ea0a953b1c80c77851ced14ea8b9c1ca046dd63eb",
+                    "mixHash" : "0x251c9437e8176e030cfa3c574e39d583a9fedf8974990fde68dd600169d27820",
+                    "nonce" : "0xdd135cdd960b0d4d",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
-                    "receiptTrie" : "0x1f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0",
-                    "stateRoot" : "0xaff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896dda",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0353eb579e141a2ca276b7e45c7fda624168984ba3b6af9f968ebedfba067107088012f6289758a45f3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0251c9437e8176e030cfa3c574e39d583a9fedf8974990fde68dd600169d2782088dd135cdd960b0d4df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2c8892c5f0d114e227041f89712bd3ac93c40f509e49f20e4af8c53869ed01e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x739372448f75c3a1759b427ea0a953b1c80c77851ced14ea8b9c1ca046dd63eb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODERipemd160_3_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_3_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0xf5c0bac238da69d36a3f3da2c4130425ac18ccb46a027e731387745c846efc24",
+                    "mixHash" : "0x39b5276d196d5b2580f754e17ae2c719acef4adef2237cf393d8a9024a61ba51",
+                    "nonce" : "0x8ab264db2cd1518a",
+                    "number" : "0x01",
+                    "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a039b5276d196d5b2580f754e17ae2c719acef4adef2237cf393d8a9024a61ba51888ab264db2cd1518af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf5c0bac238da69d36a3f3da2c4130425ac18ccb46a027e731387745c846efc24",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_3_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/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0x229a5544d6802a453d10b307d20805c07e22ede7b58c7bd0c866a4788d8a7681",
-                    "mixHash" : "0x4395ae573b3845aa589e18d0dc16314fe1c9685527dc17eec96e8b675cb8c21c",
-                    "nonce" : "0xe50927c5669be59d",
+                    "hash" : "0xd9bece93808556d41c7f0735dd95dc201249c4bc1309a393b46c270d4bfffb7b",
+                    "mixHash" : "0x5bfbdb2c52b59c2d71f94efd4db1f161a8d1f02557f8e92f9958a212570b9f41",
+                    "nonce" : "0xf4ee23c7bc230596",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
                     "receiptTrie" : "0x1f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a04395ae573b3845aa589e18d0dc16314fe1c9685527dc17eec96e8b675cb8c21c88e50927c5669be59df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a05bfbdb2c52b59c2d71f94efd4db1f161a8d1f02557f8e92f9958a212570b9f4188f4ee23c7bc230596f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x229a5544d6802a453d10b307d20805c07e22ede7b58c7bd0c866a4788d8a7681",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd9bece93808556d41c7f0735dd95dc201249c4bc1309a393b46c270d4bfffb7b",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_3_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/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf1e8",
-                    "hash" : "0x4628e822655fbf48a30f6291224fc93d57b4d1076c1bb368e65797134bfa9549",
-                    "mixHash" : "0x353510110696ae2540e7eb9219c43612f2d058653fcc4e8539cab2ea791722bf",
-                    "nonce" : "0x735464375ce7b58d",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x230be8163f46788c8e968b2ba556dc48bbfa813a39f596586a39ddd6ac7484aa",
+                    "mixHash" : "0xe64b671da6a5f3840dae545509b3351e1900b06de5c3aea05e0cb7982426a040",
+                    "nonce" : "0xa9026151c1c12f3c",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
-                    "receiptTrie" : "0x4f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aef",
-                    "stateRoot" : "0x73f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6",
+                    "receiptTrie" : "0x1f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0",
+                    "stateRoot" : "0xaff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896dda",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0353510110696ae2540e7eb9219c43612f2d058653fcc4e8539cab2ea791722bf88735464375ce7b58df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0e64b671da6a5f3840dae545509b3351e1900b06de5c3aea05e0cb7982426a04088a9026151c1c12f3cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4628e822655fbf48a30f6291224fc93d57b4d1076c1bb368e65797134bfa9549",
-        "network" : "Frontier",
+        "lastblockhash" : "0x230be8163f46788c8e968b2ba556dc48bbfa813a39f596586a39ddd6ac7484aa",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f1e8",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618778",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_3_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/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf1e8",
-                    "hash" : "0xc00536f5453a7cb1bdd11c783f2ef920db2b60c668d02036f3fbb8152bb910c3",
-                    "mixHash" : "0x4d0116118440a8f7280c6170d97306d5051e9d10c44904e28fd4d9936e297180",
-                    "nonce" : "0x1f07b0ae904320a5",
+                    "hash" : "0x2e3bc0894c33f8b5515de5fcdb31e29ba8c53f8cc2be82ae1851355f50b63132",
+                    "mixHash" : "0x067d11e35fd67e29261178a56a3d70511abec09daaabe8285387a609cf913b0c",
+                    "nonce" : "0x7606e281f071f468",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
                     "receiptTrie" : "0x4f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aef",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a04d0116118440a8f7280c6170d97306d5051e9d10c44904e28fd4d9936e297180881f07b0ae904320a5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0067d11e35fd67e29261178a56a3d70511abec09daaabe8285387a609cf913b0c887606e281f071f468f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc00536f5453a7cb1bdd11c783f2ef920db2b60c668d02036f3fbb8152bb910c3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2e3bc0894c33f8b5515de5fcdb31e29ba8c53f8cc2be82ae1851355f50b63132",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_3_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/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0xb8f27d52b6ffdc3049c7448e76b363daa82991bdd3e32c642dfe112cf6784d6e",
-                    "mixHash" : "0xb8bcd39ae2a41d41266e4dddff71a89137d808895f76fab6450368b723938869",
-                    "nonce" : "0x80cbff5efe1ab6d3",
+                    "gasUsed" : "0xf1e8",
+                    "hash" : "0xe0357f4c9b73bc5e298bc9925e9b69109297b2735bb49cf2d33a4c1ccba55f0e",
+                    "mixHash" : "0x483498bc2ae7b108fc92c11c0cb263344b8030c6dd885a7007b8d8af9393e3ad",
+                    "nonce" : "0x267f105d29a5fca1",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81",
+                    "receiptTrie" : "0x4f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aef",
+                    "stateRoot" : "0x73f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0b8bcd39ae2a41d41266e4dddff71a89137d808895f76fab6450368b7239388698880cbff5efe1ab6d3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0483498bc2ae7b108fc92c11c0cb263344b8030c6dd885a7007b8d8af9393e3ad88267f105d29a5fca1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8f27d52b6ffdc3049c7448e76b363daa82991bdd3e32c642dfe112cf6784d6e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe0357f4c9b73bc5e298bc9925e9b69109297b2735bb49cf2d33a4c1ccba55f0e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f4f1e8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a7618778",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0.json
index 67b8b0f19..d09ba849c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_3_postfixed0_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_3_postfixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0xc22cadf3147c4c280d6c504018066904077718de5bead20ab5f48ee1944cc079",
-                    "mixHash" : "0x6c9d985108fb3faeb7fab953695da02be9cebe6d3778767625bdd3810076fdfc",
-                    "nonce" : "0xa9cdfc0645db150c",
+                    "hash" : "0xfb8c131843007cc88f4dbd39a34b3fc1d7456f3c4fc6ffdfa99dc9310f2d6a7e",
+                    "mixHash" : "0x8f08abc0354ba1879988fddb9e6f8f2c533305e5bd9c6d738d3855a9d24f4941",
+                    "nonce" : "0x260ec8a63eb94471",
                     "number" : "0x01",
                     "parentHash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
-                    "receiptTrie" : "0x622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892",
-                    "stateRoot" : "0xc654acefd9a934e38098254236a4a5c80b67d3b759abced3c2e3528ec6defba1",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x0317c39ddc89b237145d02da660f7dd293cbde7377467c852afc15b71b208d36",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c654acefd9a934e38098254236a4a5c80b67d3b759abced3c2e3528ec6defba1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a06c9d985108fb3faeb7fab953695da02be9cebe6d3778767625bdd3810076fdfc88a9cdfc0645db150cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00317c39ddc89b237145d02da660f7dd293cbde7377467c852afc15b71b208d36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a08f08abc0354ba1879988fddb9e6f8f2c533305e5bd9c6d738d3855a9d24f494188260ec8a63eb94471f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc22cadf3147c4c280d6c504018066904077718de5bead20ab5f48ee1944cc079",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfb8c131843007cc88f4dbd39a34b3fc1d7456f3c4fc6ffdfa99dc9310f2d6a7e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x65f34578907f00600052602060006025600060006003611770f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODERipemd160_3_postfixed0_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_3_postfixed0_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0xf815ab2bab78087c2e5c13af50c7105dc148acede99d91b725f968e61e57c0d3",
+                    "mixHash" : "0x3d2727d0d704b80ce95b8353a97df6e74827febb26f5c030a4afbe68057e1790",
+                    "nonce" : "0x30681f096f95d672",
+                    "number" : "0x01",
+                    "parentHash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x0317c39ddc89b237145d02da660f7dd293cbde7377467c852afc15b71b208d36",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00317c39ddc89b237145d02da660f7dd293cbde7377467c852afc15b71b208d36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a03d2727d0d704b80ce95b8353a97df6e74827febb26f5c030a4afbe68057e17908830681f096f95d672f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf815ab2bab78087c2e5c13af50c7105dc148acede99d91b725f968e61e57c0d3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x65f34578907f00600052602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7730b4642169b0f16752696da8da830a4b429c9d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x65f34578907f00600052602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_3_postfixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0x7c75b9d58f6e5866994354050159ab04d5a086061e4a73acad8da2c670045a1f",
-                    "mixHash" : "0xf86ccfc2289a89631ce8403999368b1f58e87290eb429d4a5a737cabd40384f0",
-                    "nonce" : "0xbca53f6350ac9173",
+                    "hash" : "0xe2038b104359b2c9e38aa818b9a588c4e344cc499b5a816b5c977e613c80caba",
+                    "mixHash" : "0xfb8d1c815211abcd1a5388f6fb54d2d84fc89b60113e7d9233a013626aea323f",
+                    "nonce" : "0xb4af63b2dd4b7c9f",
                     "number" : "0x01",
                     "parentHash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
                     "receiptTrie" : "0x622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c654acefd9a934e38098254236a4a5c80b67d3b759abced3c2e3528ec6defba1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0f86ccfc2289a89631ce8403999368b1f58e87290eb429d4a5a737cabd40384f088bca53f6350ac9173f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c654acefd9a934e38098254236a4a5c80b67d3b759abced3c2e3528ec6defba1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0fb8d1c815211abcd1a5388f6fb54d2d84fc89b60113e7d9233a013626aea323f88b4af63b2dd4b7c9ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c75b9d58f6e5866994354050159ab04d5a086061e4a73acad8da2c670045a1f",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe2038b104359b2c9e38aa818b9a588c4e344cc499b5a816b5c977e613c80caba",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_postfixed0_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_3_postfixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf1e8",
-                    "hash" : "0x78329834781781d44439a17e5558dcc15d3de712683410d57b0d8d5c4b2567b5",
-                    "mixHash" : "0xf6984a295e9abefc4cc0f48828a3f20a2487c7b34f714b8f44b8a0329fb69906",
-                    "nonce" : "0x10bf5f937216e7b5",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0xc4d5ac243e772f7fae6e99bf07797486c4727ab97bfd6461c74b5c25de952486",
+                    "mixHash" : "0x5603d05d2556e6f3ce884002fda366758624485c941c0131c1959b83c4e9eb87",
+                    "nonce" : "0xd821752ff3e0c0a6",
                     "number" : "0x01",
                     "parentHash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
-                    "receiptTrie" : "0xcf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7",
-                    "stateRoot" : "0xb0dcf064aa7ad832106af28663e8a09e6d4bca15d8913ded87695ab296367c36",
+                    "receiptTrie" : "0x622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892",
+                    "stateRoot" : "0xc654acefd9a934e38098254236a4a5c80b67d3b759abced3c2e3528ec6defba1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0dcf064aa7ad832106af28663e8a09e6d4bca15d8913ded87695ab296367c36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0f6984a295e9abefc4cc0f48828a3f20a2487c7b34f714b8f44b8a0329fb699068810bf5f937216e7b5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c654acefd9a934e38098254236a4a5c80b67d3b759abced3c2e3528ec6defba1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0622358a29010cc710022124c4127bab4de64a2da5628333b754b678fde825892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a05603d05d2556e6f3ce884002fda366758624485c941c0131c1959b83c4e9eb8788d821752ff3e0c0a6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78329834781781d44439a17e5558dcc15d3de712683410d57b0d8d5c4b2567b5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc4d5ac243e772f7fae6e99bf07797486c4727ab97bfd6461c74b5c25de952486",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f1e8",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618778",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_postfixed0_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_3_postfixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf1e8",
-                    "hash" : "0x0711c0a0a10634aeaf06ce7f1cf88d5177b0c83450d528a58622daf035d0f953",
-                    "mixHash" : "0x298e1d19b24802e2e118549f517514938db8fb1fb2a098b14f4c37c4f0090d85",
-                    "nonce" : "0x442fee1f225e365f",
+                    "hash" : "0xbcd5fb81df11d37e06791c034145e40282e436f1c74360de77457c4d399f949c",
+                    "mixHash" : "0x37ff99bda5b99e5bd34e69ff2fbceddff7645b1fd6573a3f992337015c69a7ca",
+                    "nonce" : "0xc94e6635d0fa9d7e",
                     "number" : "0x01",
                     "parentHash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
                     "receiptTrie" : "0xcf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0dcf064aa7ad832106af28663e8a09e6d4bca15d8913ded87695ab296367c36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0298e1d19b24802e2e118549f517514938db8fb1fb2a098b14f4c37c4f0090d8588442fee1f225e365ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0dcf064aa7ad832106af28663e8a09e6d4bca15d8913ded87695ab296367c36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a037ff99bda5b99e5bd34e69ff2fbceddff7645b1fd6573a3f992337015c69a7ca88c94e6635d0fa9d7ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0711c0a0a10634aeaf06ce7f1cf88d5177b0c83450d528a58622daf035d0f953",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbcd5fb81df11d37e06791c034145e40282e436f1c74360de77457c4d399f949c",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_postfixed0_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_3_postfixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0x9378b4acd1e40be578d15493977004ad866129664524639962d72dd345a2dfd5",
-                    "mixHash" : "0xfdc7c774f83061bc5fdadef1569669e9ca7ce56fb6dcecb746c9837ab11162d1",
-                    "nonce" : "0x7d0630b4ddb16f02",
+                    "gasUsed" : "0xf1e8",
+                    "hash" : "0x9c5aaedb5f24cde81bee3af397abb4e95fe1744cf2be9c38e4028cd27e030196",
+                    "mixHash" : "0x7d0b6479c94c986411fe7baece4fdaf0f7765250f43f5d36692fb7e4d2d8f468",
+                    "nonce" : "0x29bc722e30e01aee",
                     "number" : "0x01",
                     "parentHash" : "0x402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x0317c39ddc89b237145d02da660f7dd293cbde7377467c852afc15b71b208d36",
+                    "receiptTrie" : "0xcf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7",
+                    "stateRoot" : "0xb0dcf064aa7ad832106af28663e8a09e6d4bca15d8913ded87695ab296367c36",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00317c39ddc89b237145d02da660f7dd293cbde7377467c852afc15b71b208d36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0fdc7c774f83061bc5fdadef1569669e9ca7ce56fb6dcecb746c9837ab11162d1887d0630b4ddb16f02f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0402bd7248ebc4967ef03ed581ff18dba1229ce5ee540200aed5449ffbb291681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0dcf064aa7ad832106af28663e8a09e6d4bca15d8913ded87695ab296367c36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cf507722e2738a35e98cbd2f5637c57aab0ea294bd1a4439f8124ca5aa5a62e7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a07d0b6479c94c986411fe7baece4fdaf0f7765250f43f5d36692fb7e4d2d8f4688829bc722e30e01aeef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08440179d8631dbd79b9b9a1ac1ecfbd421a981d161d898122e96a034b87b5c26a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9378b4acd1e40be578d15493977004ad866129664524639962d72dd345a2dfd5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9c5aaedb5f24cde81bee3af397abb4e95fe1744cf2be9c38e4028cd27e030196",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x65f34578907f00600052602060006025600060006003611770f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f4f1e8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a7618778",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0.json
index 1beaff561..eaddabdab 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_3_prefixed0_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_3_prefixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0x0b6fc1df4c0e281ad5a061c4734b7c192698812e5ca0af5ac67631aa7877d271",
-                    "mixHash" : "0xe9420617a0863882afdcb5e91ee32ce544b9c794d14474e106a3c8ea8f7f19b0",
-                    "nonce" : "0xa882d30fa81c040f",
+                    "hash" : "0xecfe42049bafee0deaefc66ffd7db6797d205cd08dbcdc269a51c4e352be65c3",
+                    "mixHash" : "0x98bf805dda7520d994a94890edf376c3da828895099f8f8146e43204d8381f07",
+                    "nonce" : "0xb0bc3a2e7897494c",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
-                    "receiptTrie" : "0x1f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0",
-                    "stateRoot" : "0xaff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896dda",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0e9420617a0863882afdcb5e91ee32ce544b9c794d14474e106a3c8ea8f7f19b088a882d30fa81c040ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a098bf805dda7520d994a94890edf376c3da828895099f8f8146e43204d8381f0788b0bc3a2e7897494cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b6fc1df4c0e281ad5a061c4734b7c192698812e5ca0af5ac67631aa7877d271",
-        "network" : "EIP150",
+        "lastblockhash" : "0xecfe42049bafee0deaefc66ffd7db6797d205cd08dbcdc269a51c4e352be65c3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODERipemd160_3_prefixed0_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_3_prefixed0_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x908976f0b3fd390f401ac1f8be05c4eeb63cecc525679ca9a92ee60af1551ca9",
+                    "mixHash" : "0x94de28372784da4d6fd6c75f575ac27111f9f31969656757ca6700f3fe764fd1",
+                    "nonce" : "0x484f9acd5de639bb",
+                    "number" : "0x01",
+                    "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a094de28372784da4d6fd6c75f575ac27111f9f31969656757ca6700f3fe764fd188484f9acd5de639bbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x908976f0b3fd390f401ac1f8be05c4eeb63cecc525679ca9a92ee60af1551ca9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_3_prefixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0xf96fa50703defa72557413929e402c46a5918955606954777022a1d8f141d38b",
-                    "mixHash" : "0x964e99a530e63d74d62211248e15d09b9f08228b26a00afac68f63dbd866d8ce",
-                    "nonce" : "0x8ce1741f741ac86f",
+                    "hash" : "0xa3c39e3c09822f197292ce2d95f74e925348820dfda011b5bcffcdc9290ed0bd",
+                    "mixHash" : "0x625ad0d30647ef491cf1334b9dd55a8d07a13e73cf869fbdd365ac1bcb345305",
+                    "nonce" : "0x9e8b358169d377c6",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
                     "receiptTrie" : "0x1f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0964e99a530e63d74d62211248e15d09b9f08228b26a00afac68f63dbd866d8ce888ce1741f741ac86ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0625ad0d30647ef491cf1334b9dd55a8d07a13e73cf869fbdd365ac1bcb345305889e8b358169d377c6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf96fa50703defa72557413929e402c46a5918955606954777022a1d8f141d38b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa3c39e3c09822f197292ce2d95f74e925348820dfda011b5bcffcdc9290ed0bd",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_prefixed0_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_3_prefixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf1e8",
-                    "hash" : "0x0d7c67397cf4b4e7d08c5ff6dfc60daf10cc29446e40d6a1da7eebbeae0a6d98",
-                    "mixHash" : "0x0669ee0cb1c04ee29917df59c362774bd23e98f32cfa779516346d2891d83f74",
-                    "nonce" : "0x81c0942c82c4afc9",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x979ccd6fdf736df02e59779c1bc9944e7f38b1686e0e7f37f717def773e0f533",
+                    "mixHash" : "0xc5af5dbaf17f81904f997bacf863071a8a970398cbc09b7478a43a39428f5c84",
+                    "nonce" : "0x6326e75c3e61a213",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
-                    "receiptTrie" : "0x4f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aef",
-                    "stateRoot" : "0x73f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6",
+                    "receiptTrie" : "0x1f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0",
+                    "stateRoot" : "0xaff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896dda",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a00669ee0cb1c04ee29917df59c362774bd23e98f32cfa779516346d2891d83f748881c0942c82c4afc9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aff05b1dcaa046aaa27de9773667c6b2726287a739b64bc508ec16db5c896ddaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f934a54e475886bd1727608a9dfa7eaeba50df1768e80beda8a35c10d11eab0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0c5af5dbaf17f81904f997bacf863071a8a970398cbc09b7478a43a39428f5c84886326e75c3e61a213f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d7c67397cf4b4e7d08c5ff6dfc60daf10cc29446e40d6a1da7eebbeae0a6d98",
-        "network" : "Frontier",
+        "lastblockhash" : "0x979ccd6fdf736df02e59779c1bc9944e7f38b1686e0e7f37f717def773e0f533",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f1e8",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618778",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_prefixed0_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_3_prefixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf1e8",
-                    "hash" : "0xed77b9fb95d95e26c1303b3ea381ec3c0edcb4b3aabf7575935eab3a378fd62e",
-                    "mixHash" : "0x20e854cfcec40d88e34c64b4fb6da0c9bc0df995c9989439e93c9a02bc3faea7",
-                    "nonce" : "0x969bc30a9e1a8629",
+                    "hash" : "0x8aa47252ea1b39331ba6b3cd4d66ccc5925d0d21c962189431bbb0f943c6fce1",
+                    "mixHash" : "0x69545e5c6c427b38d84fe0d6cc788e6c9a742669d24846e1d5d4cd873251fc0d",
+                    "nonce" : "0xb56131f5601a3263",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
                     "receiptTrie" : "0x4f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aef",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a020e854cfcec40d88e34c64b4fb6da0c9bc0df995c9989439e93c9a02bc3faea788969bc30a9e1a8629f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a069545e5c6c427b38d84fe0d6cc788e6c9a742669d24846e1d5d4cd873251fc0d88b56131f5601a3263f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed77b9fb95d95e26c1303b3ea381ec3c0edcb4b3aabf7575935eab3a378fd62e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8aa47252ea1b39331ba6b3cd4d66ccc5925d0d21c962189431bbb0f943c6fce1",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODERipemd160_3_prefixed0_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_3_prefixed0_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/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0x8fc202296752ed9ac03d9aff97d65ac83c16a0abb2dafa0a3e9ba486618447c6",
-                    "mixHash" : "0xf3dedfd1705964cb802690ba52a7afcf71ae1642727e2e90b6b34c788891fa5e",
-                    "nonce" : "0x97fdd4918e24748e",
+                    "gasUsed" : "0xf1e8",
+                    "hash" : "0xe0ac4bb8b21a6ac851e31a81c154b1a2c63fac9409e1cd4122aa0fe3e45cb29f",
+                    "mixHash" : "0xfb7efeab03476b67c08bc84633b1a5a0024d320a7bfbe15dd0df49eff71b70a1",
+                    "nonce" : "0x5e69940b8d0dc93e",
                     "number" : "0x01",
                     "parentHash" : "0xb3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81",
+                    "receiptTrie" : "0x4f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aef",
+                    "stateRoot" : "0x73f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0137b354a7d6b9d8d24b15435cca0a8316656272539ff0679bc71746d75f2ba81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0f3dedfd1705964cb802690ba52a7afcf71ae1642727e2e90b6b34c788891fa5e8897fdd4918e24748ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b3a176cf7e455c0a08e1e6100e1e095eb63969f592c4d019bb904c297698b483a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f187a93a36aaec79248f8f2ffd8371c928dc4f61a88d5564614c66a52f67a6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04f9bbc38fa87694217edd19415ac4f2b77b5c8f33716d3aaf0e24e2863fe8aefb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1e88203e880a0fb7efeab03476b67c08bc84633b1a5a0024d320a7bfbe15dd0df49eff71b70a1885e69940b8d0dc93ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03adfd660ac1bb13d576898c888611325ee3837f898dd1edf99491113dc556467a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8fc202296752ed9ac03d9aff97d65ac83c16a0abb2dafa0a3e9ba486618447c6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe0ac4bb8b21a6ac851e31a81c154b1a2c63fac9409e1cd4122aa0fe3e45cb29f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f4f1e8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a7618778",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0.json
index 59e7fb546..3173bdfcc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_4_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_4_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/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf401",
-                    "hash" : "0x7519b0a5395dffb7ddea67d162458ab6df4f31ffd7cbb055b7ddb036a7670190",
-                    "mixHash" : "0x5eb41e01ab35805d885b15440af7fc6b659a9544e20ace7a04b7f9a11ad61085",
-                    "nonce" : "0xe9f0c43135170b3d",
+                    "hash" : "0x760b14c3af526354519e222cadfc36f9957d458fb144d186f97b502e6084281c",
+                    "mixHash" : "0xfc84c7bb5a3744057c8afdffa6786f028298aa883ccf43bb40fada691b7d0f26",
+                    "nonce" : "0xac68254a2d883761",
                     "number" : "0x01",
                     "parentHash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
-                    "receiptTrie" : "0x17a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adc",
-                    "stateRoot" : "0x1a2ca09d33197944c7a1e36ab6f4575320d1148f9ab2f93e017ad9466b404e3b",
+                    "receiptTrie" : "0x326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692",
+                    "stateRoot" : "0x93085bb1dc094fee3dbf4c91b16cebe527875a6dc93203a6927436c49d553816",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a2ca09d33197944c7a1e36ab6f4575320d1148f9ab2f93e017ad9466b404e3ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba017a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a05eb41e01ab35805d885b15440af7fc6b659a9544e20ace7a04b7f9a11ad6108588e9f0c43135170b3df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093085bb1dc094fee3dbf4c91b16cebe527875a6dc93203a6927436c49d553816a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0fc84c7bb5a3744057c8afdffa6786f028298aa883ccf43bb40fada691b7d0f2688ac68254a2d883761f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7519b0a5395dffb7ddea67d162458ab6df4f31ffd7cbb055b7ddb036a7670190",
-        "network" : "EIP150",
+        "lastblockhash" : "0x760b14c3af526354519e222cadfc36f9957d458fb144d186f97b502e6084281c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODERipemd160_4_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_4_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf401",
+                    "hash" : "0x9c49d4f105eb4508927f824674651afc79c7260b5b7706a89edd65dba218ff8f",
+                    "mixHash" : "0x3ecc87896e1b84995c8f47b0dd1409c968c3ea2f2f468f243efcf8bcd4570f14",
+                    "nonce" : "0xe24843cb6c12b728",
+                    "number" : "0x01",
+                    "parentHash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
+                    "receiptTrie" : "0x326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692",
+                    "stateRoot" : "0x93085bb1dc094fee3dbf4c91b16cebe527875a6dc93203a6927436c49d553816",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093085bb1dc094fee3dbf4c91b16cebe527875a6dc93203a6927436c49d553816a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a03ecc87896e1b84995c8f47b0dd1409c968c3ea2f2f468f243efcf8bcd4570f1488e24843cb6c12b728f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9c49d4f105eb4508927f824674651afc79c7260b5b7706a89edd65dba218ff8f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f401",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761855f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_4_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/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf401",
-                    "hash" : "0x6c156bf6571e4c838720a31d3f00ce5c9abaa359fbe24830b44490e2b20cdada",
-                    "mixHash" : "0xc79304169f94c4229815a9882a18bf5490ee3b596a0ae4bba1a4b5fbaddc8b35",
-                    "nonce" : "0xddd19c54730575a9",
+                    "hash" : "0x908399701d2ccd15de58ee78e394690e427aca0e43c35315eb5755573c022867",
+                    "mixHash" : "0xd21bd82e8fa7a90d289b0454828fc2fe98531d6f6fc7e91d3af87a0f9ac4cbf1",
+                    "nonce" : "0xe57ee93f53f8db02",
                     "number" : "0x01",
                     "parentHash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
                     "receiptTrie" : "0x17a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adc",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a2ca09d33197944c7a1e36ab6f4575320d1148f9ab2f93e017ad9466b404e3ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba017a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0c79304169f94c4229815a9882a18bf5490ee3b596a0ae4bba1a4b5fbaddc8b3588ddd19c54730575a9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a2ca09d33197944c7a1e36ab6f4575320d1148f9ab2f93e017ad9466b404e3ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba017a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0d21bd82e8fa7a90d289b0454828fc2fe98531d6f6fc7e91d3af87a0f9ac4cbf188e57ee93f53f8db02f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c156bf6571e4c838720a31d3f00ce5c9abaa359fbe24830b44490e2b20cdada",
-        "network" : "EIP158",
+        "lastblockhash" : "0x908399701d2ccd15de58ee78e394690e427aca0e43c35315eb5755573c022867",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_4_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/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf16d",
-                    "hash" : "0x573ccff3fae6a1a74a49347c982374310e51d282a91ddcf8a2d477438c44d899",
-                    "mixHash" : "0xdf79b4e9b2e7cab6923676004421f056a2fdbf2a3da01f5814f56c568784515f",
-                    "nonce" : "0xb88164674c55c354",
+                    "gasUsed" : "0xf401",
+                    "hash" : "0x07795b7a0e56a43f5bf1038ae2e19955feefe2895edc6bb72cbf7f12146c439c",
+                    "mixHash" : "0xb9c910f5c25020e1855184c9d74dc57fe59b8d61981506398558ab3015ab8d57",
+                    "nonce" : "0x09b7d6ac481ec21d",
                     "number" : "0x01",
                     "parentHash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
-                    "receiptTrie" : "0x196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606",
-                    "stateRoot" : "0x5ea206e97be85f1ec112eeeb1f13c20dc37821ad342efb13b849c1dfcf35eef4",
+                    "receiptTrie" : "0x17a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adc",
+                    "stateRoot" : "0x1a2ca09d33197944c7a1e36ab6f4575320d1148f9ab2f93e017ad9466b404e3b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ea206e97be85f1ec112eeeb1f13c20dc37821ad342efb13b849c1dfcf35eef4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f16d8203e880a0df79b4e9b2e7cab6923676004421f056a2fdbf2a3da01f5814f56c568784515f88b88164674c55c354f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a2ca09d33197944c7a1e36ab6f4575320d1148f9ab2f93e017ad9466b404e3ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba017a72e7cd55bd36aaa484ca7acbe86d64c253ed7208c949ec10f595721866adcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0b9c910f5c25020e1855184c9d74dc57fe59b8d61981506398558ab3015ab8d578809b7d6ac481ec21df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x573ccff3fae6a1a74a49347c982374310e51d282a91ddcf8a2d477438c44d899",
-        "network" : "Frontier",
+        "lastblockhash" : "0x07795b7a0e56a43f5bf1038ae2e19955feefe2895edc6bb72cbf7f12146c439c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f16d",
+                "balance" : "0x4563918244f4f401",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187f3",
+                "balance" : "0x0de0b6b3a761855f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_4_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/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf16d",
-                    "hash" : "0x5b5dcf702d68e895276e338f188a7dac48fd7b04941d67f7fb781d914ec1228a",
-                    "mixHash" : "0xe961bbcd59ce681508078c45eaf117b3228098c2362e5024b03f9dcdb14d2904",
-                    "nonce" : "0x4507aada2e07ec31",
+                    "hash" : "0xd36478fbd36c5366c3434d2feef35b04829f303182c71ca9a96e63a25b06f7a2",
+                    "mixHash" : "0x9ac83c22ca0f7fe6d85c4097770a5d70bea6f1e8a181e979c8f77aa7f80c261e",
+                    "nonce" : "0xfdec65a522074a61",
                     "number" : "0x01",
                     "parentHash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
                     "receiptTrie" : "0x196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ea206e97be85f1ec112eeeb1f13c20dc37821ad342efb13b849c1dfcf35eef4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f16d8203e880a0e961bbcd59ce681508078c45eaf117b3228098c2362e5024b03f9dcdb14d2904884507aada2e07ec31f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ea206e97be85f1ec112eeeb1f13c20dc37821ad342efb13b849c1dfcf35eef4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f16d8203e880a09ac83c22ca0f7fe6d85c4097770a5d70bea6f1e8a181e979c8f77aa7f80c261e88fdec65a522074a61f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b5dcf702d68e895276e338f188a7dac48fd7b04941d67f7fb781d914ec1228a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd36478fbd36c5366c3434d2feef35b04829f303182c71ca9a96e63a25b06f7a2",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_4_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/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf401",
-                    "hash" : "0x52a8604748b13db3009e076c7829739e56d028d03572fcbaa9903d20912de00e",
-                    "mixHash" : "0x75a8c6446fc447aeaa48f7216d7f141f905e9de986c3104e45ced7b9e3e5387b",
-                    "nonce" : "0xa5533e43b1111c15",
+                    "gasUsed" : "0xf16d",
+                    "hash" : "0x0071f6cf31a73814d959bcef05df99cab97ab104afe6db2ef5ef89d33a133460",
+                    "mixHash" : "0xd940091143a54695f215e6afbcc51808b59f70fac8c28ee19ea81c5aaae1af0c",
+                    "nonce" : "0xf89dc07205698129",
                     "number" : "0x01",
                     "parentHash" : "0xe4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61ec",
-                    "receiptTrie" : "0x326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692",
-                    "stateRoot" : "0x93085bb1dc094fee3dbf4c91b16cebe527875a6dc93203a6927436c49d553816",
+                    "receiptTrie" : "0x196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606",
+                    "stateRoot" : "0x5ea206e97be85f1ec112eeeb1f13c20dc37821ad342efb13b849c1dfcf35eef4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093085bb1dc094fee3dbf4c91b16cebe527875a6dc93203a6927436c49d553816a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a075a8c6446fc447aeaa48f7216d7f141f905e9de986c3104e45ced7b9e3e5387b88a5533e43b1111c15f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e4b561e82d0e1bd6a52ee207c4218de4ae9fc99bc68903e9a4db7d3fc1fd61eca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ea206e97be85f1ec112eeeb1f13c20dc37821ad342efb13b849c1dfcf35eef4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0196bcc998b8d6535e7a72736b93708d9eb79cb218161dc1c804deed47783d606b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f16d8203e880a0d940091143a54695f215e6afbcc51808b59f70fac8c28ee19ea81c5aaae1af0c88f89dc07205698129f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6ea7a11c696d86467d37c918dbb8d59127860f7ca5b6ac67ce4c85cfef1f333a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52a8604748b13db3009e076c7829739e56d028d03572fcbaa9903d20912de00e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0071f6cf31a73814d959bcef05df99cab97ab104afe6db2ef5ef89d33a133460",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f401",
+                "balance" : "0x4563918244f4f16d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761855f",
+                "balance" : "0x0de0b6b3a76187f3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0.json
index cf4f565c6..eb279910e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_4_gas719_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_4_gas719_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/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb968",
-                    "hash" : "0x5a0136d45a32eeb8ebe14cd4bc9ba9b60b265cd407bb530d31578099ec3d38eb",
-                    "mixHash" : "0x20126f8a79b399a78a26a73b2fb5d0b4f233f2183630afbcf59ba8cb8a76b930",
-                    "nonce" : "0x1aa4f7f110d348d4",
+                    "hash" : "0xc79a70291215c31264198e980130c524fbb611f6bc21948ab1062cfc6575f9b7",
+                    "mixHash" : "0x2f8950267297b2d0044ae6642d7fd3780aeeb01937a482df296d715467cc9929",
+                    "nonce" : "0x222245d2384629ac",
                     "number" : "0x01",
                     "parentHash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
-                    "receiptTrie" : "0x0bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357d",
-                    "stateRoot" : "0xe19be16aa8917371f440f22420382d279427f1fada3284f5c2822b4b44cf2ae5",
+                    "receiptTrie" : "0x950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40",
+                    "stateRoot" : "0x1c90732aeeb34abf809ead3c3b3d263782dbc9e47eda0476145f81f0c20e06b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e19be16aa8917371f440f22420382d279427f1fada3284f5c2822b4b44cf2ae5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a020126f8a79b399a78a26a73b2fb5d0b4f233f2183630afbcf59ba8cb8a76b930881aa4f7f110d348d4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c90732aeeb34abf809ead3c3b3d263782dbc9e47eda0476145f81f0c20e06b3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a02f8950267297b2d0044ae6642d7fd3780aeeb01937a482df296d715467cc992988222245d2384629acf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a0136d45a32eeb8ebe14cd4bc9ba9b60b265cd407bb530d31578099ec3d38eb",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc79a70291215c31264198e980130c524fbb611f6bc21948ab1062cfc6575f9b7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_gas719_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_4_gas719_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/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb968",
-                    "hash" : "0xd1e3906e20bae967c2debc95b2623bc685c9d72534fe39455a1e0623a8cdce82",
-                    "mixHash" : "0xd82c22d06a8711adb20fe33f14d0596aed2eb9c7a4885b33a24dfef005761322",
-                    "nonce" : "0x3ef9b1cf5df1f627",
+                    "hash" : "0x257556fcaa6d4a5dc466a13e46c187cc4a8849fbc4e56016b2edcca995d93f72",
+                    "mixHash" : "0xec2eb6af544f738a9a55283671214d8f2af50228e20adee58a7eda1cb61a1dd8",
+                    "nonce" : "0xf627d83bcf85a601",
+                    "number" : "0x01",
+                    "parentHash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
+                    "receiptTrie" : "0x950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40",
+                    "stateRoot" : "0x1c90732aeeb34abf809ead3c3b3d263782dbc9e47eda0476145f81f0c20e06b3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c90732aeeb34abf809ead3c3b3d263782dbc9e47eda0476145f81f0c20e06b3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a0ec2eb6af544f738a9a55283671214d8f2af50228e20adee58a7eda1cb61a1dd888f627d83bcf85a601f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x257556fcaa6d4a5dc466a13e46c187cc4a8849fbc4e56016b2edcca995d93f72",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b968",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761bff8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_4_gas719_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xb968",
+                    "hash" : "0xc1d7f74364877a51e3bfaa4c3975dac53916238c88e7b6ac54a9a47ea4c83e29",
+                    "mixHash" : "0x4a059112ea0e76312dbee450895404b24916d95871793fcbf3395d884ea07eea",
+                    "nonce" : "0xf539791b5474b0a5",
                     "number" : "0x01",
                     "parentHash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
                     "receiptTrie" : "0x0bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357d",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e19be16aa8917371f440f22420382d279427f1fada3284f5c2822b4b44cf2ae5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a0d82c22d06a8711adb20fe33f14d0596aed2eb9c7a4885b33a24dfef005761322883ef9b1cf5df1f627f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e19be16aa8917371f440f22420382d279427f1fada3284f5c2822b4b44cf2ae5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a04a059112ea0e76312dbee450895404b24916d95871793fcbf3395d884ea07eea88f539791b5474b0a5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1e3906e20bae967c2debc95b2623bc685c9d72534fe39455a1e0623a8cdce82",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc1d7f74364877a51e3bfaa4c3975dac53916238c88e7b6ac54a9a47ea4c83e29",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_gas719_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_4_gas719_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/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb6d4",
-                    "hash" : "0x71c98352a368a0fd121f265931827fdb195b3f6d070da624d1d48f12d17a4fc4",
-                    "mixHash" : "0x8cb1a56e4bc4e6b8a635292d97b319cfe3a3b2a7b1438068c39852811f5b3e5c",
-                    "nonce" : "0xc2b33bcd7ff6559b",
+                    "gasUsed" : "0xb968",
+                    "hash" : "0xdaba7b7ec782ca41445dbe67c281fbb60e1e861f19d4f5c48d7efec6171a7c94",
+                    "mixHash" : "0xdf2b54cea9de5aec327c1a012cdd420603898644a2d61e3ef461fae2e1de97d3",
+                    "nonce" : "0xcbf4a33e7ad6ef18",
                     "number" : "0x01",
                     "parentHash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
-                    "receiptTrie" : "0x815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dc",
-                    "stateRoot" : "0xc51c66e365a39129de92bb52660525b20a118b79ea0bf5ca339b3aaf3710b9f7",
+                    "receiptTrie" : "0x0bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357d",
+                    "stateRoot" : "0xe19be16aa8917371f440f22420382d279427f1fada3284f5c2822b4b44cf2ae5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c51c66e365a39129de92bb52660525b20a118b79ea0bf5ca339b3aaf3710b9f7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6d48203e880a08cb1a56e4bc4e6b8a635292d97b319cfe3a3b2a7b1438068c39852811f5b3e5c88c2b33bcd7ff6559bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e19be16aa8917371f440f22420382d279427f1fada3284f5c2822b4b44cf2ae5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00bffef2e24beb0c627f8de646b85c0328bbaed7d728e16e3053f0da11dde357db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a0df2b54cea9de5aec327c1a012cdd420603898644a2d61e3ef461fae2e1de97d388cbf4a33e7ad6ef18f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71c98352a368a0fd121f265931827fdb195b3f6d070da624d1d48f12d17a4fc4",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdaba7b7ec782ca41445dbe67c281fbb60e1e861f19d4f5c48d7efec6171a7c94",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b6d4",
+                "balance" : "0x4563918244f4b968",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c28c",
+                "balance" : "0x0de0b6b3a761bff8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_gas719_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_4_gas719_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/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb6d4",
-                    "hash" : "0x8967860c3bd84828878a2a63077e1a2387397000b8eeb00108f528b435dac329",
-                    "mixHash" : "0xec80c35272bbf2194ba78a6247d4072f0692f70d70e37eaa1dc258c513f158a8",
-                    "nonce" : "0x48f6bcf88932504f",
+                    "hash" : "0xd40a6af16ddd261d4efeeb796332a92623d331e8bdd1f782a9a948d457aba790",
+                    "mixHash" : "0x6250aefc5de5330666da941b3634149f178f0343176b3b8f460e871518b2482b",
+                    "nonce" : "0xd8407b71f90aff74",
                     "number" : "0x01",
                     "parentHash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
                     "receiptTrie" : "0x815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dc",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c51c66e365a39129de92bb52660525b20a118b79ea0bf5ca339b3aaf3710b9f7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6d48203e880a0ec80c35272bbf2194ba78a6247d4072f0692f70d70e37eaa1dc258c513f158a88848f6bcf88932504ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c51c66e365a39129de92bb52660525b20a118b79ea0bf5ca339b3aaf3710b9f7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6d48203e880a06250aefc5de5330666da941b3634149f178f0343176b3b8f460e871518b2482b88d8407b71f90aff74f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8967860c3bd84828878a2a63077e1a2387397000b8eeb00108f528b435dac329",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd40a6af16ddd261d4efeeb796332a92623d331e8bdd1f782a9a948d457aba790",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODERipemd160_4_gas719_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_4_gas719_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/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb968",
-                    "hash" : "0xb7a363143e13e1fef71af7075765511f876457d1f380def5a11329b1e8daccf2",
-                    "mixHash" : "0x6b5c5704f02e71181c8eb63eb9452800143fc14db030585b6e455d58d58dd898",
-                    "nonce" : "0x98b34b2cd5067fcd",
+                    "gasUsed" : "0xb6d4",
+                    "hash" : "0x7b95ddb981633c6fe7ba9d84403654b4303a7176661d3c0305919a4e81057469",
+                    "mixHash" : "0x6e53b0461a7ebd2d1f3634c7add43b989694363b0cb47edb85e7047acdeaaa38",
+                    "nonce" : "0x5f19b09f9f6663e8",
                     "number" : "0x01",
                     "parentHash" : "0x9867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825",
-                    "receiptTrie" : "0x950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40",
-                    "stateRoot" : "0x1c90732aeeb34abf809ead3c3b3d263782dbc9e47eda0476145f81f0c20e06b3",
+                    "receiptTrie" : "0x815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dc",
+                    "stateRoot" : "0xc51c66e365a39129de92bb52660525b20a118b79ea0bf5ca339b3aaf3710b9f7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c90732aeeb34abf809ead3c3b3d263782dbc9e47eda0476145f81f0c20e06b3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a06b5c5704f02e71181c8eb63eb9452800143fc14db030585b6e455d58d58dd8988898b34b2cd5067fcdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a09867335669a6a0fb47c1b2e6c52fc6ef687ca3965f6145cf100713aeaefbe825a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c51c66e365a39129de92bb52660525b20a118b79ea0bf5ca339b3aaf3710b9f7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0815511e718db605c0f6bfd4c92dbf040cfa233aac4df795c49b8d98aa9c3f6dcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6d48203e880a06e53b0461a7ebd2d1f3634c7add43b989694363b0cb47edb85e7047acdeaaa38885f19b09f9f6663e8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b8abe03bd1b446284460895400c9bf38491a355a024e3258f0493d82a14aec5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a363143e13e1fef71af7075765511f876457d1f380def5a11329b1e8daccf2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7b95ddb981633c6fe7ba9d84403654b4303a7176661d3c0305919a4e81057469",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b968",
+                "balance" : "0x4563918244f4b6d4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761bff8",
+                "balance" : "0x0de0b6b3a761c28c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0.json
index 120b31f82..5d28b866e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODERipemd160_5_d0g0v0_EIP150" : {
+    "CALLCODERipemd160_5_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/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f56d0",
-                    "hash" : "0x8c743e0546abcce599ed6e4a7fe34aefbebdb4fd4835acb22c62ca75d90b03a7",
-                    "mixHash" : "0x755de13fcb3a40477aef0e795d370e6a169d238af8b83f2f55ee16e7692dd2fe",
-                    "nonce" : "0x66495459a5fe7e72",
+                    "hash" : "0xebff50e790044c39467f56d6af644ff445d1862ec2d932e99c8667cc4d42404f",
+                    "mixHash" : "0xb6a22f6c83e28e11e9ce58039511956ddb5a4181937d7e21ad1253abca7e18e9",
+                    "nonce" : "0xe33f78d31cb109b9",
                     "number" : "0x01",
                     "parentHash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
-                    "receiptTrie" : "0xdfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898ad",
-                    "stateRoot" : "0xebc32cdd5afd8e722f473fbf10417a5d2b0169a36d5f13e22a6f61642f3377b8",
+                    "receiptTrie" : "0xcf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22d",
+                    "stateRoot" : "0xb51a96d6ee33012b9925ea192331dcead81b91240ca35ae049d02df9365c8e9f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebc32cdd5afd8e722f473fbf10417a5d2b0169a36d5f13e22a6f61642f3377b8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0dfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898adb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0755de13fcb3a40477aef0e795d370e6a169d238af8b83f2f55ee16e7692dd2fe8866495459a5fe7e72f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b51a96d6ee33012b9925ea192331dcead81b91240ca35ae049d02df9365c8e9fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0b6a22f6c83e28e11e9ce58039511956ddb5a4181937d7e21ad1253abca7e18e988e33f78d31cb109b9f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c743e0546abcce599ed6e4a7fe34aefbebdb4fd4835acb22c62ca75d90b03a7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xebff50e790044c39467f56d6af644ff445d1862ec2d932e99c8667cc4d42404f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODERipemd160_5_d0g0v0_EIP158" : {
+    "CALLCODERipemd160_5_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/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f56d0",
-                    "hash" : "0x90822d8ffa8d1a3276a41b056e5a3ce5cc69bceab109ae56f93ecadec1129074",
-                    "mixHash" : "0x468c9c636a2eaf1264732bb587c4c5d8c01d0b03e5fd065ac43728d6801df7da",
-                    "nonce" : "0xf4bbf048b03c4d23",
+                    "hash" : "0x879f02f76facc7b155a19308102d8167973bede45f246361da8d5c78c7f6d798",
+                    "mixHash" : "0x6e91c11daf31f3cd886b17d07a6a2ee0ca8aef4d153f7da82bc7714cc24193fd",
+                    "nonce" : "0x4d4819eb8b5edd11",
+                    "number" : "0x01",
+                    "parentHash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
+                    "receiptTrie" : "0xcf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22d",
+                    "stateRoot" : "0xb51a96d6ee33012b9925ea192331dcead81b91240ca35ae049d02df9365c8e9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b51a96d6ee33012b9925ea192331dcead81b91240ca35ae049d02df9365c8e9fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a06e91c11daf31f3cd886b17d07a6a2ee0ca8aef4d153f7da82bc7714cc24193fd884d4819eb8b5edd11f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x879f02f76facc7b155a19308102d8167973bede45f246361da8d5c78c7f6d798",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182451356d0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7432290",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODERipemd160_5_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1f56d0",
+                    "hash" : "0x6723c77d6128afb88f0d6afd2af3bc088402fc2a7dbb0bc8776cb6408a5f841a",
+                    "mixHash" : "0x641d04a1646c6b377014865e325ccd518a79f64df9633b1dc8ce432e2150f3a7",
+                    "nonce" : "0x66c5986d2f9f8b31",
                     "number" : "0x01",
                     "parentHash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
                     "receiptTrie" : "0xdfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898ad",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebc32cdd5afd8e722f473fbf10417a5d2b0169a36d5f13e22a6f61642f3377b8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0dfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898adb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0468c9c636a2eaf1264732bb587c4c5d8c01d0b03e5fd065ac43728d6801df7da88f4bbf048b03c4d23f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebc32cdd5afd8e722f473fbf10417a5d2b0169a36d5f13e22a6f61642f3377b8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0dfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898adb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0641d04a1646c6b377014865e325ccd518a79f64df9633b1dc8ce432e2150f3a78866c5986d2f9f8b31f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90822d8ffa8d1a3276a41b056e5a3ce5cc69bceab109ae56f93ecadec1129074",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6723c77d6128afb88f0d6afd2af3bc088402fc2a7dbb0bc8776cb6408a5f841a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODERipemd160_5_d0g0v0_Frontier" : {
+    "CALLCODERipemd160_5_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/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f543c",
-                    "hash" : "0x673c473d61ed7cfeedcccd389e37d086c3f5b93e9bf0baef46bdc4514d09d7e4",
-                    "mixHash" : "0x11aab51328fca42a43004a54f5b1508a16c2d6bc7403575074afc20e5158d10f",
-                    "nonce" : "0x454f7fc2dbd26bd6",
+                    "gasUsed" : "0x1f56d0",
+                    "hash" : "0xa2df504fef71d80779f81f1952ab9d52c24ca1b338a1cf3fc0793215eb1e384c",
+                    "mixHash" : "0x3b431632b8bfe33a62a01d2276fbfee970cfff300e49560241db516b94c1a14b",
+                    "nonce" : "0x428885ad04065d6c",
                     "number" : "0x01",
                     "parentHash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
-                    "receiptTrie" : "0x231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5",
-                    "stateRoot" : "0x89d056036038c883135802dfd1ad31b8fb5acdfacfae06aa2d2531a585c3e58f",
+                    "receiptTrie" : "0xdfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898ad",
+                    "stateRoot" : "0xebc32cdd5afd8e722f473fbf10417a5d2b0169a36d5f13e22a6f61642f3377b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089d056036038c883135802dfd1ad31b8fb5acdfacfae06aa2d2531a585c3e58fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f543c8203e880a011aab51328fca42a43004a54f5b1508a16c2d6bc7403575074afc20e5158d10f88454f7fc2dbd26bd6f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebc32cdd5afd8e722f473fbf10417a5d2b0169a36d5f13e22a6f61642f3377b8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0dfbf5f97a7a7733384e487997ea3051fc7d307f94d8413063e6ef8243b4898adb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a03b431632b8bfe33a62a01d2276fbfee970cfff300e49560241db516b94c1a14b88428885ad04065d6cf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x673c473d61ed7cfeedcccd389e37d086c3f5b93e9bf0baef46bdc4514d09d7e4",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa2df504fef71d80779f81f1952ab9d52c24ca1b338a1cf3fc0793215eb1e384c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513543c",
+                "balance" : "0x45639182451356d0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7432524",
+                "balance" : "0x0de0b6b3a7432290",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODERipemd160_5_d0g0v0_Homestead" : {
+    "CALLCODERipemd160_5_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/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f543c",
-                    "hash" : "0x652ca1012cddad593193587fa07f16d1c98d0e6abc6d42ba72a1db5cd081d0f4",
-                    "mixHash" : "0x7540f3c7909bd2140c576cca5569c5a63ebff8f8428c8a1b326bb0d74a581362",
-                    "nonce" : "0x545e7d11a5629cf4",
+                    "hash" : "0xb621b94455ad8691f43c26924fe4818228303d8d9130bf14d7f2e0e6725cdc6a",
+                    "mixHash" : "0x605f507756666f1b26ed57450901ae3f6a9ec1c321e90b87e6aade785cdf2eaf",
+                    "nonce" : "0xe07ce3db4c169a68",
                     "number" : "0x01",
                     "parentHash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
                     "receiptTrie" : "0x231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089d056036038c883135802dfd1ad31b8fb5acdfacfae06aa2d2531a585c3e58fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f543c8203e880a07540f3c7909bd2140c576cca5569c5a63ebff8f8428c8a1b326bb0d74a58136288545e7d11a5629cf4f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089d056036038c883135802dfd1ad31b8fb5acdfacfae06aa2d2531a585c3e58fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f543c8203e880a0605f507756666f1b26ed57450901ae3f6a9ec1c321e90b87e6aade785cdf2eaf88e07ce3db4c169a68f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x652ca1012cddad593193587fa07f16d1c98d0e6abc6d42ba72a1db5cd081d0f4",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb621b94455ad8691f43c26924fe4818228303d8d9130bf14d7f2e0e6725cdc6a",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODERipemd160_5_d0g0v0_Metropolis" : {
+    "CALLCODERipemd160_5_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/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f56d0",
-                    "hash" : "0xbc8f9857222eb08718f70f498355d098ad1b22ed66f197c23f105532423aaee5",
-                    "mixHash" : "0xbf34428abf1d16d5d2e1bde15f36d1c228dd8d8f10d09e7d586dbb6d5d7cc7f7",
-                    "nonce" : "0xe7312ec80e7c6665",
+                    "gasUsed" : "0x1f543c",
+                    "hash" : "0x0f705d617ced5e0a05e327dc56a97c6d7ec3dbe7d2bca24082ec4698e75e0ac1",
+                    "mixHash" : "0xe0d8cc59a7aebb255389eb0238218e1d7ae9dcbad275b07374dac1ff03181ba3",
+                    "nonce" : "0xf8d2d706eeb76d32",
                     "number" : "0x01",
                     "parentHash" : "0xb1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058c",
-                    "receiptTrie" : "0xcf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22d",
-                    "stateRoot" : "0xb51a96d6ee33012b9925ea192331dcead81b91240ca35ae049d02df9365c8e9f",
+                    "receiptTrie" : "0x231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5",
+                    "stateRoot" : "0x89d056036038c883135802dfd1ad31b8fb5acdfacfae06aa2d2531a585c3e58f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b51a96d6ee33012b9925ea192331dcead81b91240ca35ae049d02df9365c8e9fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0bf34428abf1d16d5d2e1bde15f36d1c228dd8d8f10d09e7d586dbb6d5d7cc7f788e7312ec80e7c6665f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0b1176917a17d4f7f8a75810044be5c0ba8140b3be824ab3e9ecf82151d3d058ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089d056036038c883135802dfd1ad31b8fb5acdfacfae06aa2d2531a585c3e58fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0231f4f7d14ebf14e207eeaf539095c1bb8ebbbb284ed8265c61058277fbd0dc5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f543c8203e880a0e0d8cc59a7aebb255389eb0238218e1d7ae9dcbad275b07374dac1ff03181ba388f8d2d706eeb76d32f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d15ed9217f5c9b0b5f6110f2c8264aef25d16f0e1fae3f1078f2fbb74e6266fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc8f9857222eb08718f70f498355d098ad1b22ed66f197c23f105532423aaee5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0f705d617ced5e0a05e327dc56a97c6d7ec3dbe7d2bca24082ec4698e75e0ac1",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451356d0",
+                "balance" : "0x456391824513543c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7432290",
+                "balance" : "0x0de0b6b3a7432524",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0_d0g0v0.json
index 6164d03ce..5356edf70 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_0_d0g0v0_EIP150" : {
+    "CALLCODESha256_0_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/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa356",
-                    "hash" : "0xba69319b0403455bc87c0d2950f1df7f290eeb1424286c4b8f7634cd7cb40ca6",
-                    "mixHash" : "0xce4579998e8ad6534cf35ea600d709df31eb1ff1d06c272c88e3aeb8a920843f",
-                    "nonce" : "0xbec1ee59255cafd6",
+                    "hash" : "0x32be273d6736aada4c1bf87ba94cf0c300ea2780031f5b6068f34e1dab5e1d24",
+                    "mixHash" : "0x6679fb8e1a31b8fac0fca7783f0f410669e4c52bf46c76d4a1c490bcb8090974",
+                    "nonce" : "0xa6953250549af8bd",
                     "number" : "0x01",
                     "parentHash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
-                    "receiptTrie" : "0xf29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9e",
-                    "stateRoot" : "0x2a5de739593790ab763b2c716e44769ede48452f8a2e670d120163118075ce64",
+                    "receiptTrie" : "0x2bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddac",
+                    "stateRoot" : "0x1f5dff81b25e3fbb963ff623655ea0cbbcd8b1bc07de5c94142ba2b584df3378",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a5de739593790ab763b2c716e44769ede48452f8a2e670d120163118075ce64a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a0ce4579998e8ad6534cf35ea600d709df31eb1ff1d06c272c88e3aeb8a920843f88bec1ee59255cafd6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f5dff81b25e3fbb963ff623655ea0cbbcd8b1bc07de5c94142ba2b584df3378a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddacb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a06679fb8e1a31b8fac0fca7783f0f410669e4c52bf46c76d4a1c490bcb809097488a6953250549af8bdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba69319b0403455bc87c0d2950f1df7f290eeb1424286c4b8f7634cd7cb40ca6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x32be273d6736aada4c1bf87ba94cf0c300ea2780031f5b6068f34e1dab5e1d24",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600260fff2600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODESha256_0_d0g0v0_EIP158" : {
+    "CALLCODESha256_0_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/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa356",
-                    "hash" : "0x3dba5209784491ab1e03ce67250c3c2a5e95f9d3cb940809edbac38ce7945fe6",
-                    "mixHash" : "0x3994d89aaaac3d773cc4fda177c99bc67e31d02bc061973d78ef4a854441571b",
-                    "nonce" : "0x662fdb89320a48a5",
+                    "hash" : "0x85c52417e3c830270981885d20012152b0cfc5eca924d99374e89348f74dcd14",
+                    "mixHash" : "0xad7c9852682e0e0cef1c5a4abfce698fbca3f8511da4a672008c4915ccaee083",
+                    "nonce" : "0x471284018661066b",
+                    "number" : "0x01",
+                    "parentHash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
+                    "receiptTrie" : "0x2bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddac",
+                    "stateRoot" : "0x1f5dff81b25e3fbb963ff623655ea0cbbcd8b1bc07de5c94142ba2b584df3378",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f5dff81b25e3fbb963ff623655ea0cbbcd8b1bc07de5c94142ba2b584df3378a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddacb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a0ad7c9852682e0e0cef1c5a4abfce698fbca3f8511da4a672008c4915ccaee08388471284018661066bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x85c52417e3c830270981885d20012152b0cfc5eca924d99374e89348f74dcd14",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x600160005260206000602060006000600260fff2600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a356",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d60a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x600160005260206000602060006000600260fff2600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_0_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xa356",
+                    "hash" : "0xd2ef5efda9c686e8e100674eac2fbcb9773407f81790a4214adc98457c227cfe",
+                    "mixHash" : "0x1faa400b01b6e319ef44b8659091b5ae90b3bd5fbb3d66d9175467f69849a6be",
+                    "nonce" : "0x38807028c9c5255e",
                     "number" : "0x01",
                     "parentHash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
                     "receiptTrie" : "0xf29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9e",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a5de739593790ab763b2c716e44769ede48452f8a2e670d120163118075ce64a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a03994d89aaaac3d773cc4fda177c99bc67e31d02bc061973d78ef4a854441571b88662fdb89320a48a5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a5de739593790ab763b2c716e44769ede48452f8a2e670d120163118075ce64a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a01faa400b01b6e319ef44b8659091b5ae90b3bd5fbb3d66d9175467f69849a6be8838807028c9c5255ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3dba5209784491ab1e03ce67250c3c2a5e95f9d3cb940809edbac38ce7945fe6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd2ef5efda9c686e8e100674eac2fbcb9773407f81790a4214adc98457c227cfe",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODESha256_0_d0g0v0_Frontier" : {
+    "CALLCODESha256_0_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/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa0c2",
-                    "hash" : "0x0a86d677bb69704f9efc719163814eaa6f83b19b16e2cf29e7443366ec2219e0",
-                    "mixHash" : "0xff5a75f756eb2887a88c9d2ff402c94885f9f2deee464abc6211e2b1e365477b",
-                    "nonce" : "0xb6f66d6d0557b53a",
+                    "gasUsed" : "0xa356",
+                    "hash" : "0xa48c4ee9008e8f44e1d1466f4a238244e52ec25436b4a5dba3849513d42f0f62",
+                    "mixHash" : "0xc010b9bd1047b8eecf3ad99b853058bacfa6384968de9121ac8b48f593012f74",
+                    "nonce" : "0x3e6d886fdbe8cfb9",
                     "number" : "0x01",
                     "parentHash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
-                    "receiptTrie" : "0xe3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856",
-                    "stateRoot" : "0x46eabd73b22870175f765ef72a67ced940d9284ede276535211674f1a98adb0b",
+                    "receiptTrie" : "0xf29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9e",
+                    "stateRoot" : "0x2a5de739593790ab763b2c716e44769ede48452f8a2e670d120163118075ce64",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa046eabd73b22870175f765ef72a67ced940d9284ede276535211674f1a98adb0ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0c28203e880a0ff5a75f756eb2887a88c9d2ff402c94885f9f2deee464abc6211e2b1e365477b88b6f66d6d0557b53af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a5de739593790ab763b2c716e44769ede48452f8a2e670d120163118075ce64a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f29978ad60692c5da8c72188ef58451439c67c04a09a7fcee3409a4ea00baf9eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a0c010b9bd1047b8eecf3ad99b853058bacfa6384968de9121ac8b48f593012f74883e6d886fdbe8cfb9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a86d677bb69704f9efc719163814eaa6f83b19b16e2cf29e7443366ec2219e0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa48c4ee9008e8f44e1d1466f4a238244e52ec25436b4a5dba3849513d42f0f62",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a0c2",
+                "balance" : "0x4563918244f4a356",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d89e",
+                "balance" : "0x0de0b6b3a761d60a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODESha256_0_d0g0v0_Homestead" : {
+    "CALLCODESha256_0_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/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa0c2",
-                    "hash" : "0xce555774837fd9132bd7c9e22faf734749e927c31d34a2e7497f331cc5facc26",
-                    "mixHash" : "0x1f39daaf2e525a14148147d82dae227160f55451fda5ea0a02039592cdb54e55",
-                    "nonce" : "0xedc8ebc419557098",
+                    "hash" : "0x78f8f33423b78e6e6f249e9800722a9074a81162d44bb407ed884daf08506aae",
+                    "mixHash" : "0x81acb8c825b7e327ad26b27b7b3d0518fe0456660cd7bce87630858d4575a39e",
+                    "nonce" : "0x8bdc56e5eeeb4e45",
                     "number" : "0x01",
                     "parentHash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
                     "receiptTrie" : "0xe3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa046eabd73b22870175f765ef72a67ced940d9284ede276535211674f1a98adb0ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0c28203e880a01f39daaf2e525a14148147d82dae227160f55451fda5ea0a02039592cdb54e5588edc8ebc419557098f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa046eabd73b22870175f765ef72a67ced940d9284ede276535211674f1a98adb0ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0c28203e880a081acb8c825b7e327ad26b27b7b3d0518fe0456660cd7bce87630858d4575a39e888bdc56e5eeeb4e45f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce555774837fd9132bd7c9e22faf734749e927c31d34a2e7497f331cc5facc26",
-        "network" : "Homestead",
+        "lastblockhash" : "0x78f8f33423b78e6e6f249e9800722a9074a81162d44bb407ed884daf08506aae",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODESha256_0_d0g0v0_Metropolis" : {
+    "CALLCODESha256_0_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/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa356",
-                    "hash" : "0xd5126523517841bbfeb3a561b29128760f320b2869080c6ba8bc4962b8a3e435",
-                    "mixHash" : "0x1d920adf3ea7fa7da6a231748beada561af7b7b72f450eaa1f32d3ee0e1f3eec",
-                    "nonce" : "0x66cc3f36a22e6161",
+                    "gasUsed" : "0xa0c2",
+                    "hash" : "0xf9a90e6bdb133ad547e960a7b4861311a12372354809b455b60fb6ebddd4782b",
+                    "mixHash" : "0x406897c8dd7c4d8416fdcb6f530ef9e8d61ae04c6489a1069b194c9baf62ad86",
+                    "nonce" : "0x22722dd7d1bd4cae",
                     "number" : "0x01",
                     "parentHash" : "0xd8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67",
-                    "receiptTrie" : "0x2bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddac",
-                    "stateRoot" : "0x1f5dff81b25e3fbb963ff623655ea0cbbcd8b1bc07de5c94142ba2b584df3378",
+                    "receiptTrie" : "0xe3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856",
+                    "stateRoot" : "0x46eabd73b22870175f765ef72a67ced940d9284ede276535211674f1a98adb0b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f5dff81b25e3fbb963ff623655ea0cbbcd8b1bc07de5c94142ba2b584df3378a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddacb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a01d920adf3ea7fa7da6a231748beada561af7b7b72f450eaa1f32d3ee0e1f3eec8866cc3f36a22e6161f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0d8b6061c2e967ab941c318cdb41db409b5263630e39824caef16eccf1b874d67a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa046eabd73b22870175f765ef72a67ced940d9284ede276535211674f1a98adb0ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e3bdaef080f2c4556196a45c392b329765410d0df59f992a649aa471c28af856b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0c28203e880a0406897c8dd7c4d8416fdcb6f530ef9e8d61ae04c6489a1069b194c9baf62ad868822722dd7d1bd4caef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d06301eba023a86939569ac48451e90f0843cbd304329f9d44670b10fa1d1faaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5126523517841bbfeb3a561b29128760f320b2869080c6ba8bc4962b8a3e435",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf9a90e6bdb133ad547e960a7b4861311a12372354809b455b60fb6ebddd4782b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600260fff2600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a356",
+                "balance" : "0x4563918244f4a0c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d60a",
+                "balance" : "0x0de0b6b3a761d89e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_d0g0v0.json
index 8e42f2c47..71d556cfd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_1_d0g0v0_EIP150" : {
+    "CALLCODESha256_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf164",
-                    "hash" : "0x43035ce48bb02bb7f8e6845ba08dbc2f1524360a5e5228331a294fab4d86d923",
-                    "mixHash" : "0x404dac6c6a391fb715316fcfa4c9aa559aed77c4ecc0af5b8f383766db52dc6e",
-                    "nonce" : "0x24bb3c83d5760ed0",
+                    "hash" : "0xb3ffdf6c0a854e4bfd433ea2fc3bc1cf38f9878aba68e4dff627fc5fb26746e0",
+                    "mixHash" : "0xe3f7b4312f19040599ed72fcecafd7b3cef6c6333df79bf8273d1b8f3116a21d",
+                    "nonce" : "0xa58fd4b1afe006b8",
                     "number" : "0x01",
                     "parentHash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
-                    "receiptTrie" : "0x8989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956f",
-                    "stateRoot" : "0x4902e7fcf164d76c7f5df0258fcd85df38f7167c99ef6a9944e0aa65eb004542",
+                    "receiptTrie" : "0x8af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fa",
+                    "stateRoot" : "0x99fbc9bb5433f9fa1de508b6ac1cef42b28b5650110491f974af11c570b50331",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04902e7fcf164d76c7f5df0258fcd85df38f7167c99ef6a9944e0aa65eb004542a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a0404dac6c6a391fb715316fcfa4c9aa559aed77c4ecc0af5b8f383766db52dc6e8824bb3c83d5760ed0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099fbc9bb5433f9fa1de508b6ac1cef42b28b5650110491f974af11c570b50331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a0e3f7b4312f19040599ed72fcecafd7b3cef6c6333df79bf8273d1b8f3116a21d88a58fd4b1afe006b8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43035ce48bb02bb7f8e6845ba08dbc2f1524360a5e5228331a294fab4d86d923",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb3ffdf6c0a854e4bfd433ea2fc3bc1cf38f9878aba68e4dff627fc5fb26746e0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x6020600060006000600060026101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_1_d0g0v0_EIP158" : {
+    "CALLCODESha256_1_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf164",
+                    "hash" : "0x795c1e53e44cba2520aa63975d8b749836b664f875a41302160f0264ab2a4fe8",
+                    "mixHash" : "0x4c12e530f53860f4b2229b072c134da58d91d44f8c9f82769b3e5862a5dc62cd",
+                    "nonce" : "0x09a1d57625407403",
+                    "number" : "0x01",
+                    "parentHash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
+                    "receiptTrie" : "0x8af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fa",
+                    "stateRoot" : "0x99fbc9bb5433f9fa1de508b6ac1cef42b28b5650110491f974af11c570b50331",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099fbc9bb5433f9fa1de508b6ac1cef42b28b5650110491f974af11c570b50331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a04c12e530f53860f4b2229b072c134da58d91d44f8c9f82769b3e5862a5dc62cd8809a1d57625407403f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x795c1e53e44cba2520aa63975d8b749836b664f875a41302160f0264ab2a4fe8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x6020600060006000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f164",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187fc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x6020600060006000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf164",
-                    "hash" : "0x503ba19da957a8ddd3dd44c185c6b54e8e42a3da59f7dfaa553bf3cefd7a64f4",
-                    "mixHash" : "0x93a02ee12fb38d03cef4b7c99df37117c1f987a4326c00bf63d250d13e137002",
-                    "nonce" : "0x5aee407b78babc36",
+                    "hash" : "0x8935c0da76d7d65d8cd39e3b0644289a2536c33f2fac28c998f26eb07880729a",
+                    "mixHash" : "0x2cf25ca6479e2f1dac2a52f74a65aaa732d4611a72238dbc9285e6b50fa5d30a",
+                    "nonce" : "0xefc7e7fbcc2d1599",
                     "number" : "0x01",
                     "parentHash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
                     "receiptTrie" : "0x8989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956f",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04902e7fcf164d76c7f5df0258fcd85df38f7167c99ef6a9944e0aa65eb004542a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a093a02ee12fb38d03cef4b7c99df37117c1f987a4326c00bf63d250d13e137002885aee407b78babc36f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04902e7fcf164d76c7f5df0258fcd85df38f7167c99ef6a9944e0aa65eb004542a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a02cf25ca6479e2f1dac2a52f74a65aaa732d4611a72238dbc9285e6b50fa5d30a88efc7e7fbcc2d1599f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x503ba19da957a8ddd3dd44c185c6b54e8e42a3da59f7dfaa553bf3cefd7a64f4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8935c0da76d7d65d8cd39e3b0644289a2536c33f2fac28c998f26eb07880729a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_1_d0g0v0_Frontier" : {
+    "CALLCODESha256_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeed0",
-                    "hash" : "0x53dcb81f778c0a6cf8bc208e0f679f1e8a6be59b99915e7b3520819d893adaa8",
-                    "mixHash" : "0xec88a72c6e5f274d05b589d12ce91685a548e116ae36fd5c77b3fe3e7698a6c7",
-                    "nonce" : "0xfc2eb1f88adef996",
+                    "gasUsed" : "0xf164",
+                    "hash" : "0xebaf6ae1f593a0619461b43410c7ea5a5ac945672339cc111a99ae2c1c4e854e",
+                    "mixHash" : "0xdab61d281661588e39d975ba38cbaebdcd082f44b5f58de5d007bbf38a7b500b",
+                    "nonce" : "0xa1369f49d8029b34",
                     "number" : "0x01",
                     "parentHash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
-                    "receiptTrie" : "0x726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582",
-                    "stateRoot" : "0x4925b0b06a399eb387e3022eb43ff7ae4caf53fb24105b3f1359e58cae00a4c8",
+                    "receiptTrie" : "0x8989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956f",
+                    "stateRoot" : "0x4902e7fcf164d76c7f5df0258fcd85df38f7167c99ef6a9944e0aa65eb004542",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04925b0b06a399eb387e3022eb43ff7ae4caf53fb24105b3f1359e58cae00a4c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eed08203e880a0ec88a72c6e5f274d05b589d12ce91685a548e116ae36fd5c77b3fe3e7698a6c788fc2eb1f88adef996f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04902e7fcf164d76c7f5df0258fcd85df38f7167c99ef6a9944e0aa65eb004542a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08989ef2314abe0aa063972d5acfcc5259b1028d372404f36e4a0e81d5434956fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a0dab61d281661588e39d975ba38cbaebdcd082f44b5f58de5d007bbf38a7b500b88a1369f49d8029b34f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53dcb81f778c0a6cf8bc208e0f679f1e8a6be59b99915e7b3520819d893adaa8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xebaf6ae1f593a0619461b43410c7ea5a5ac945672339cc111a99ae2c1c4e854e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eed0",
+                "balance" : "0x4563918244f4f164",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a90",
+                "balance" : "0x0de0b6b3a76187fc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_1_d0g0v0_Homestead" : {
+    "CALLCODESha256_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeed0",
-                    "hash" : "0x62d59f8d3dca7784eb9e0537dc9a5a570d4911c3756147ede4f78d387fc108fb",
-                    "mixHash" : "0x4961b42524057bfe37b83a27874bb79e1dfa40688d80f9f6671bb83e770fa51a",
-                    "nonce" : "0x22dcc1130c798569",
+                    "hash" : "0x4baffbe5b154741d1164f1f5662e724b3722631295c468a362eef5403488e6e8",
+                    "mixHash" : "0xbc50be0360c5e635b1004d62494a78b13ddccc1c67fae4e07a019fb7ff9572cf",
+                    "nonce" : "0xd997c49baca0e2be",
                     "number" : "0x01",
                     "parentHash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
                     "receiptTrie" : "0x726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04925b0b06a399eb387e3022eb43ff7ae4caf53fb24105b3f1359e58cae00a4c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eed08203e880a04961b42524057bfe37b83a27874bb79e1dfa40688d80f9f6671bb83e770fa51a8822dcc1130c798569f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04925b0b06a399eb387e3022eb43ff7ae4caf53fb24105b3f1359e58cae00a4c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eed08203e880a0bc50be0360c5e635b1004d62494a78b13ddccc1c67fae4e07a019fb7ff9572cf88d997c49baca0e2bef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62d59f8d3dca7784eb9e0537dc9a5a570d4911c3756147ede4f78d387fc108fb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4baffbe5b154741d1164f1f5662e724b3722631295c468a362eef5403488e6e8",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_1_d0g0v0_Metropolis" : {
+    "CALLCODESha256_1_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/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf164",
-                    "hash" : "0x04b283f0a388a1d7589004a105e9f5ed302402a5e16015e959df2f4d0e61292e",
-                    "mixHash" : "0x6419a458f19d1c0b0a06fd0fe9c7e1c75f464c0d857b3b5bc6fcae656edd0851",
-                    "nonce" : "0x79f34d36963fe3b6",
+                    "gasUsed" : "0xeed0",
+                    "hash" : "0x47a13e41d0f0c5eae731589573a551d93288259e207aee176b59312a7300662e",
+                    "mixHash" : "0x23adf31c292b54485a1f2e06db3cbc97acb7b38694c548e1c48848d46c3b503c",
+                    "nonce" : "0xb2f308cff82a888f",
                     "number" : "0x01",
                     "parentHash" : "0x135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365",
-                    "receiptTrie" : "0x8af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fa",
-                    "stateRoot" : "0x99fbc9bb5433f9fa1de508b6ac1cef42b28b5650110491f974af11c570b50331",
+                    "receiptTrie" : "0x726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582",
+                    "stateRoot" : "0x4925b0b06a399eb387e3022eb43ff7ae4caf53fb24105b3f1359e58cae00a4c8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099fbc9bb5433f9fa1de508b6ac1cef42b28b5650110491f974af11c570b50331a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a06419a458f19d1c0b0a06fd0fe9c7e1c75f464c0d857b3b5bc6fcae656edd08518879f34d36963fe3b6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0135576d94ab4ebcc3c2fa2382739fc6f0a1a9e471b25af8fdbba8e6a80565365a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04925b0b06a399eb387e3022eb43ff7ae4caf53fb24105b3f1359e58cae00a4c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0726524df5c9a9bcdede6e4f43f9fba1068d7a8687b0b4a88b40c55126829c582b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eed08203e880a023adf31c292b54485a1f2e06db3cbc97acb7b38694c548e1c48848d46c3b503c88b2f308cff82a888ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceaa49f6c8d7484883366e0b343d1ed3c61e00b4098296b67185b63bef2e6e90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04b283f0a388a1d7589004a105e9f5ed302402a5e16015e959df2f4d0e61292e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x47a13e41d0f0c5eae731589573a551d93288259e207aee176b59312a7300662e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x6020600060006000600060026101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f164",
+                "balance" : "0x4563918244f4eed0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187fc",
+                "balance" : "0x0de0b6b3a7618a90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0.json
index 6946241d1..b1b5b2e03 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_1_nonzeroValue_d0g0v0_EIP150" : {
+    "CALLCODESha256_1_nonzeroValue_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/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010b90",
-                    "hash" : "0x16e6da3373e605e61fd9356e797eb29404ad365a746c3c41e5a1c5bb873b2243",
-                    "mixHash" : "0xfaa1878c0a75f5fe2d1ba283c7be823da9c5ac95862f9fa576be3c2b2b4de13a",
-                    "nonce" : "0xf4244ffca230b33c",
+                    "hash" : "0x4b33754bee517b2d77a502fc52592b8b29d88ac689f8da28f7b83b981d2e3ffa",
+                    "mixHash" : "0xb7d16d74db835889e236d04746bad8ab41a585e4527b2fe41640381af80b8f49",
+                    "nonce" : "0x9d053e8f2e418699",
                     "number" : "0x01",
                     "parentHash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
-                    "receiptTrie" : "0x96978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08",
-                    "stateRoot" : "0x9a6c5cdd6eb0aaf532878e3ddb922056b5c59903561c44a13f8b3a1bb112a6ca",
+                    "receiptTrie" : "0x60fe4683d2b28b9c976b3d99c2b3c96f3ec90a6ca8de1df88cb43d807c54546d",
+                    "stateRoot" : "0x03132093ceb9a6e8763297a398b0381ec1dedd2a533e5e00187e96614ff5d685",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a6c5cdd6eb0aaf532878e3ddb922056b5c59903561c44a13f8b3a1bb112a6caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba096978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a0faa1878c0a75f5fe2d1ba283c7be823da9c5ac95862f9fa576be3c2b2b4de13a88f4244ffca230b33cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003132093ceb9a6e8763297a398b0381ec1dedd2a533e5e00187e96614ff5d685a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba060fe4683d2b28b9c976b3d99c2b3c96f3ec90a6ca8de1df88cb43d807c54546db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a0b7d16d74db835889e236d04746bad8ab41a585e4527b2fe41640381af80b8f49889d053e8f2e418699f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16e6da3373e605e61fd9356e797eb29404ad365a746c3c41e5a1c5bb873b2243",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4b33754bee517b2d77a502fc52592b8b29d88ac689f8da28f7b83b981d2e3ffa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
                 "code" : "0x60206000600060006013600262030d40f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_1_nonzeroValue_d0g0v0_EIP158" : {
+    "CALLCODESha256_1_nonzeroValue_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x010b90",
+                    "hash" : "0xe760f119543cac174c26f48971817d61888db8e0cf2f3cf4d4691e1fd0d12daf",
+                    "mixHash" : "0x54c4ec1939b625c5250e53866060dc7f47fa1e2b71813abcd16a630519340b58",
+                    "nonce" : "0x6265e2a6f7f532a0",
+                    "number" : "0x01",
+                    "parentHash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
+                    "receiptTrie" : "0x60fe4683d2b28b9c976b3d99c2b3c96f3ec90a6ca8de1df88cb43d807c54546d",
+                    "stateRoot" : "0x03132093ceb9a6e8763297a398b0381ec1dedd2a533e5e00187e96614ff5d685",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003132093ceb9a6e8763297a398b0381ec1dedd2a533e5e00187e96614ff5d685a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba060fe4683d2b28b9c976b3d99c2b3c96f3ec90a6ca8de1df88cb43d807c54546db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a054c4ec1939b625c5250e53866060dc7f47fa1e2b71813abcd16a630519340b58886265e2a6f7f532a0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe760f119543cac174c26f48971817d61888db8e0cf2f3cf4d4691e1fd0d12daf",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bed48a0",
+                "code" : "0x60206000600060006013600262030d40f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50b90",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616dd0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bebc200",
+                "code" : "0x60206000600060006013600262030d40f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_1_nonzeroValue_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/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010b90",
-                    "hash" : "0xbf9aa7d627305a0362b1cf2c1d7699a5386997ad92a4d80f0a7d6898882876dc",
-                    "mixHash" : "0xeeddc48eb380e7044a0661c0c79901859937dc52af13214a7ee59a811aa56ca2",
-                    "nonce" : "0xd4eb666e8c96b56c",
+                    "hash" : "0xcfa707067fa0f34082a0c0eb40f899a9910b08d79a57eeebac11263fd71aac31",
+                    "mixHash" : "0xcc18abdbb83262b6fc5abaeefd4280bc75af0147f7e1baa2f1de91b2ec74c105",
+                    "nonce" : "0x6834b3f28a67b0fa",
                     "number" : "0x01",
                     "parentHash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
                     "receiptTrie" : "0x96978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a6c5cdd6eb0aaf532878e3ddb922056b5c59903561c44a13f8b3a1bb112a6caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba096978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a0eeddc48eb380e7044a0661c0c79901859937dc52af13214a7ee59a811aa56ca288d4eb666e8c96b56cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a6c5cdd6eb0aaf532878e3ddb922056b5c59903561c44a13f8b3a1bb112a6caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba096978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a0cc18abdbb83262b6fc5abaeefd4280bc75af0147f7e1baa2f1de91b2ec74c105886834b3f28a67b0faf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf9aa7d627305a0362b1cf2c1d7699a5386997ad92a4d80f0a7d6898882876dc",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcfa707067fa0f34082a0c0eb40f899a9910b08d79a57eeebac11263fd71aac31",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_1_nonzeroValue_d0g0v0_Frontier" : {
+    "CALLCODESha256_1_nonzeroValue_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/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0108fc",
-                    "hash" : "0xc638bcba70e387e56f3148070608c7a4793f8f8562212a7f24b4c22dc09aa1a4",
-                    "mixHash" : "0xffa79c940280d8a20646a9790403cadcb88b5a5634a27c8a127d27e1f0c491ec",
-                    "nonce" : "0x854aea4dfa9a1eb9",
+                    "gasUsed" : "0x010b90",
+                    "hash" : "0xd2636bf06182d0512f12032277a6c77135769fef06a50f65c9c2c602634bae9d",
+                    "mixHash" : "0x933bfbeaf188e96343ee70dba41e0c5094606e92c270ff34b8b82d2e4f83190a",
+                    "nonce" : "0x6bba5b448a63de30",
                     "number" : "0x01",
                     "parentHash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
-                    "receiptTrie" : "0x47e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320",
-                    "stateRoot" : "0x851d0ed8bcdf6868e9855a71be136f7ad1e6d66ef4bb22efec3c05064d381584",
+                    "receiptTrie" : "0x96978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08",
+                    "stateRoot" : "0x9a6c5cdd6eb0aaf532878e3ddb922056b5c59903561c44a13f8b3a1bb112a6ca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0851d0ed8bcdf6868e9855a71be136f7ad1e6d66ef4bb22efec3c05064d381584a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba047e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830108fc8203e880a0ffa79c940280d8a20646a9790403cadcb88b5a5634a27c8a127d27e1f0c491ec88854aea4dfa9a1eb9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a6c5cdd6eb0aaf532878e3ddb922056b5c59903561c44a13f8b3a1bb112a6caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba096978509f78ee0b502bc81f7180a993b82213f95f1e83a2669d4760e6a828f08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a0933bfbeaf188e96343ee70dba41e0c5094606e92c270ff34b8b82d2e4f83190a886bba5b448a63de30f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc638bcba70e387e56f3148070608c7a4793f8f8562212a7f24b4c22dc09aa1a4",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd2636bf06182d0512f12032277a6c77135769fef06a50f65c9c2c602634bae9d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f508fc",
+                "balance" : "0x4563918244f50b90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617064",
+                "balance" : "0x0de0b6b3a7616dd0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_1_nonzeroValue_d0g0v0_Homestead" : {
+    "CALLCODESha256_1_nonzeroValue_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/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0108fc",
-                    "hash" : "0xcfb346945c2687303a179613ccbff5bb35c33bf5cc487a9c7f1ad54f3b450a8b",
-                    "mixHash" : "0xb8a9445e44e374f44a7e4b43e65f30566519beaa30878bc31e5d0d73299cca3d",
-                    "nonce" : "0xe36c4183a99ea88f",
+                    "hash" : "0xa0f533cb896884e44e46caba9d23d9d36f17a35705f8db17b2a5801d7ca79a4d",
+                    "mixHash" : "0xad0c2caaec81d701fa11022946d9242f9a0a0f64b4a3074d19f4619bc6725b39",
+                    "nonce" : "0xcf22ae2d8467ba27",
                     "number" : "0x01",
                     "parentHash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
                     "receiptTrie" : "0x47e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0851d0ed8bcdf6868e9855a71be136f7ad1e6d66ef4bb22efec3c05064d381584a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba047e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830108fc8203e880a0b8a9445e44e374f44a7e4b43e65f30566519beaa30878bc31e5d0d73299cca3d88e36c4183a99ea88ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0851d0ed8bcdf6868e9855a71be136f7ad1e6d66ef4bb22efec3c05064d381584a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba047e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830108fc8203e880a0ad0c2caaec81d701fa11022946d9242f9a0a0f64b4a3074d19f4619bc6725b3988cf22ae2d8467ba27f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfb346945c2687303a179613ccbff5bb35c33bf5cc487a9c7f1ad54f3b450a8b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa0f533cb896884e44e46caba9d23d9d36f17a35705f8db17b2a5801d7ca79a4d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_1_nonzeroValue_d0g0v0_Metropolis" : {
+    "CALLCODESha256_1_nonzeroValue_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/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x010b90",
-                    "hash" : "0xb6c21415541ef52daf04556af492a1a77ed0daeb1b036ad7f99dc2bfb0555485",
-                    "mixHash" : "0x6274f9d70987da44d3086dc306a77ece110e0a7970f40495065865bdb09ae7bc",
-                    "nonce" : "0x99de47782901883d",
+                    "gasUsed" : "0x0108fc",
+                    "hash" : "0x07e46c332d046f402525b0bf3e7155a7e2614c2d8983231ce9788e28650f9077",
+                    "mixHash" : "0x0f57105becf1c77fb260e62ec118c5c6d680c86c5604a52f8e63439b93b4f177",
+                    "nonce" : "0xf29d2a78cae04cef",
                     "number" : "0x01",
                     "parentHash" : "0xfa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988",
-                    "receiptTrie" : "0x60fe4683d2b28b9c976b3d99c2b3c96f3ec90a6ca8de1df88cb43d807c54546d",
-                    "stateRoot" : "0x03132093ceb9a6e8763297a398b0381ec1dedd2a533e5e00187e96614ff5d685",
+                    "receiptTrie" : "0x47e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320",
+                    "stateRoot" : "0x851d0ed8bcdf6868e9855a71be136f7ad1e6d66ef4bb22efec3c05064d381584",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003132093ceb9a6e8763297a398b0381ec1dedd2a533e5e00187e96614ff5d685a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba060fe4683d2b28b9c976b3d99c2b3c96f3ec90a6ca8de1df88cb43d807c54546db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010b908203e880a06274f9d70987da44d3086dc306a77ece110e0a7970f40495065865bdb09ae7bc8899de47782901883df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0fa1e79e1774cae619e7e7764870c5020256a66e1d8e6d6e1c8268bfb75a29988a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0851d0ed8bcdf6868e9855a71be136f7ad1e6d66ef4bb22efec3c05064d381584a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba047e4f96feff664fe733daf645933ca969686df6b86048a03beecd25294cb6320b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830108fc8203e880a00f57105becf1c77fb260e62ec118c5c6d680c86c5604a52f8e63439b93b4f17788f29d2a78cae04ceff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9ada047fe0d2470ec96969d6eb6b2091ba934f38ea439d25306545acde9e866a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6c21415541ef52daf04556af492a1a77ed0daeb1b036ad7f99dc2bfb0555485",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x07e46c332d046f402525b0bf3e7155a7e2614c2d8983231ce9788e28650f9077",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed48a0",
                 "code" : "0x60206000600060006013600262030d40f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50b90",
+                "balance" : "0x4563918244f508fc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616dd0",
+                "balance" : "0x0de0b6b3a7617064",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2_d0g0v0.json
index 022c259a5..e0c5817fc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_2_d0g0v0_EIP150" : {
+    "CALLCODESha256_2_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/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0xd6bd085ea77ddcae0dfb560792d5f2a1e9bae15715d9421ff9bbed507ed40205",
-                    "mixHash" : "0xa5cdd2a942027078d5b23b03c5c19bde565bbda8edd6480a6410d2321942067f",
-                    "nonce" : "0xef1ec0265421cba1",
+                    "hash" : "0xba052041af112dd8773a522e3832f46509d3d87620aaa9f708f6e084bd7eab81",
+                    "mixHash" : "0xa078194110f23b5c519c69334e5f8352e5be928795cbbd8f23708682a9466ff0",
+                    "nonce" : "0x1e345c4bd36bc16a",
                     "number" : "0x01",
                     "parentHash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
-                    "receiptTrie" : "0x7b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2",
-                    "stateRoot" : "0xcd70ecdf91f1685b18ad0e458f7b692e290f53df9c4bf91a662013c20486e474",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x27c2abc488d013ce34428db95bf9e2be467eab6f80d4d56179b10828c82cb29e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd70ecdf91f1685b18ad0e458f7b692e290f53df9c4bf91a662013c20486e474a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a5cdd2a942027078d5b23b03c5c19bde565bbda8edd6480a6410d2321942067f88ef1ec0265421cba1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c2abc488d013ce34428db95bf9e2be467eab6f80d4d56179b10828c82cb29ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a078194110f23b5c519c69334e5f8352e5be928795cbbd8f23708682a9466ff0881e345c4bd36bc16af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6bd085ea77ddcae0dfb560792d5f2a1e9bae15715d9421ff9bbed507ed40205",
-        "network" : "EIP150",
+        "lastblockhash" : "0xba052041af112dd8773a522e3832f46509d3d87620aaa9f708f6e084bd7eab81",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6005526020600060256000600060026101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_2_d0g0v0_EIP158" : {
+    "CALLCODESha256_2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x3577e17aec6402c883c3a627f52ad3a2b6375f8242256702bf5502849d7eace2",
+                    "mixHash" : "0x57e92288143f9adcdf3d637b54e07382155ccdc82f6d38ea6b6db53fc75d646b",
+                    "nonce" : "0xedb28d21478e2f0f",
+                    "number" : "0x01",
+                    "parentHash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x27c2abc488d013ce34428db95bf9e2be467eab6f80d4d56179b10828c82cb29e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c2abc488d013ce34428db95bf9e2be467eab6f80d4d56179b10828c82cb29ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a057e92288143f9adcdf3d637b54e07382155ccdc82f6d38ea6b6db53fc75d646b88edb28d21478e2f0ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3577e17aec6402c883c3a627f52ad3a2b6375f8242256702bf5502849d7eace2",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6005526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6005526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_2_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/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0xfadd8e8dc66305fb4c065eb5b1f79772cc997852abb1170c8da59be5e7961e90",
-                    "mixHash" : "0xe9cbf4cdf8ae7699a90c74a4d51e6dac61615ac7407fe655066cb798ddfd8270",
-                    "nonce" : "0x310b35f64513b8e1",
+                    "hash" : "0x8a48deb04c8459a526a4295f623f8d05939a6129b8dbc845c6e0b77a3c35fe19",
+                    "mixHash" : "0xdf679e7d1dbac755727270a7fa4a64738061cdcfad0fdb6d28e0135f9b7e2de4",
+                    "nonce" : "0xe1a7330b978a4f38",
                     "number" : "0x01",
                     "parentHash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
                     "receiptTrie" : "0x7b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd70ecdf91f1685b18ad0e458f7b692e290f53df9c4bf91a662013c20486e474a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0e9cbf4cdf8ae7699a90c74a4d51e6dac61615ac7407fe655066cb798ddfd827088310b35f64513b8e1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd70ecdf91f1685b18ad0e458f7b692e290f53df9c4bf91a662013c20486e474a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0df679e7d1dbac755727270a7fa4a64738061cdcfad0fdb6d28e0135f9b7e2de488e1a7330b978a4f38f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfadd8e8dc66305fb4c065eb5b1f79772cc997852abb1170c8da59be5e7961e90",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8a48deb04c8459a526a4295f623f8d05939a6129b8dbc845c6e0b77a3c35fe19",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_2_d0g0v0_Frontier" : {
+    "CALLCODESha256_2_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/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeef4",
-                    "hash" : "0x445b37e9035cd1dcbcafffd898aedceb1b77d688780bba3eacf0e4e0c1df0e9a",
-                    "mixHash" : "0x19a0934b2fc7e1cfebfb3570a236a55fbfb299eadaea956a4c41324fb94c9ef6",
-                    "nonce" : "0x990a66ce59b13c83",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x2b6dda5d43f325f8d249058146a8ce8e94603a72090b8653001caa8e7f445722",
+                    "mixHash" : "0xb0906398eb8a7b4e9310366242d799260105957a8072773c8c7b991280030543",
+                    "nonce" : "0xa544176dc103e8ff",
                     "number" : "0x01",
                     "parentHash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
-                    "receiptTrie" : "0x0db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4",
-                    "stateRoot" : "0x5b1afff3636dd97cdd89ad3d99376fb2730fb7cd13251aea29c6a5002325fca9",
+                    "receiptTrie" : "0x7b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2",
+                    "stateRoot" : "0xcd70ecdf91f1685b18ad0e458f7b692e290f53df9c4bf91a662013c20486e474",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b1afff3636dd97cdd89ad3d99376fb2730fb7cd13251aea29c6a5002325fca9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a019a0934b2fc7e1cfebfb3570a236a55fbfb299eadaea956a4c41324fb94c9ef688990a66ce59b13c83f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd70ecdf91f1685b18ad0e458f7b692e290f53df9c4bf91a662013c20486e474a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07b2e2c16d72ec3c2b6ea3c1f6981d5dbf1000f049ab3c80fce85938bf44a6fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0b0906398eb8a7b4e9310366242d799260105957a8072773c8c7b99128003054388a544176dc103e8fff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x445b37e9035cd1dcbcafffd898aedceb1b77d688780bba3eacf0e4e0c1df0e9a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2b6dda5d43f325f8d249058146a8ce8e94603a72090b8653001caa8e7f445722",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eef4",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a6c",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_2_d0g0v0_Homestead" : {
+    "CALLCODESha256_2_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/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeef4",
-                    "hash" : "0xf7e961f4a2b8eb248d9d6b9247fae9fef1bfb18368bb17b30769c170e95fe15e",
-                    "mixHash" : "0xccdf5f7d4a7d390f3e49dd294e1cdc7683939c31d04baf0f4d0d1106e8bd5b85",
-                    "nonce" : "0x4e69e4efdbda4b26",
+                    "hash" : "0x21a302c701b294c9d5a8c72911c5614c0ebaf2fc047ba8a6bd1e7602438b3305",
+                    "mixHash" : "0x9cba9dee0fe127f7457c65868751d11dcde3d5a6eaeb68644a0c88fcdfcabb6a",
+                    "nonce" : "0x4a7c24f133811778",
                     "number" : "0x01",
                     "parentHash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
                     "receiptTrie" : "0x0db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b1afff3636dd97cdd89ad3d99376fb2730fb7cd13251aea29c6a5002325fca9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0ccdf5f7d4a7d390f3e49dd294e1cdc7683939c31d04baf0f4d0d1106e8bd5b85884e69e4efdbda4b26f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b1afff3636dd97cdd89ad3d99376fb2730fb7cd13251aea29c6a5002325fca9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a09cba9dee0fe127f7457c65868751d11dcde3d5a6eaeb68644a0c88fcdfcabb6a884a7c24f133811778f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7e961f4a2b8eb248d9d6b9247fae9fef1bfb18368bb17b30769c170e95fe15e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x21a302c701b294c9d5a8c72911c5614c0ebaf2fc047ba8a6bd1e7602438b3305",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_2_d0g0v0_Metropolis" : {
+    "CALLCODESha256_2_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/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x941821b2bb55e16c44916fd3b4ddcb16c637b5baa547801def07ad9b2da16ade",
-                    "mixHash" : "0x8ceb9bede20d082412313c62b13a0cc9b81664e2fc2316be6d95b0d2b62dc850",
-                    "nonce" : "0x64d9a7b2a4f2d251",
+                    "gasUsed" : "0xeef4",
+                    "hash" : "0x8c3672710dfabd3b882b3d8e1094dd9586b282179ef723b0953747c57dbcd3a0",
+                    "mixHash" : "0xd2ffb929111c8750014db9128a6ba3ad15a2abf605315b935aa91acca06ad243",
+                    "nonce" : "0xbb216d0a7fee1e79",
                     "number" : "0x01",
                     "parentHash" : "0xc2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9f",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x27c2abc488d013ce34428db95bf9e2be467eab6f80d4d56179b10828c82cb29e",
+                    "receiptTrie" : "0x0db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4",
+                    "stateRoot" : "0x5b1afff3636dd97cdd89ad3d99376fb2730fb7cd13251aea29c6a5002325fca9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027c2abc488d013ce34428db95bf9e2be467eab6f80d4d56179b10828c82cb29ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a08ceb9bede20d082412313c62b13a0cc9b81664e2fc2316be6d95b0d2b62dc8508864d9a7b2a4f2d251f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c2376bd143c68969473d5ed0f67e470a9503a428f26d6cc28023b54fc33f9a9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b1afff3636dd97cdd89ad3d99376fb2730fb7cd13251aea29c6a5002325fca9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00db35d6553cb6c1f793911c0bec5566994aa075e3659de6339d6c08bb8677da4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0d2ffb929111c8750014db9128a6ba3ad15a2abf605315b935aa91acca06ad24388bb216d0a7fee1e79f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e10b49f56ad7e4140d1f1b0f98084ef2b696178814bc24fef2aaf5d1ece1dbf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x941821b2bb55e16c44916fd3b4ddcb16c637b5baa547801def07ad9b2da16ade",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8c3672710dfabd3b882b3d8e1094dd9586b282179ef723b0953747c57dbcd3a0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6005526020600060256000600060026101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f4eef4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a7618a6c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_d0g0v0.json
index 1aa4a04b3..2336b0e82 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_3_d0g0v0_EIP150" : {
+    "CALLCODESha256_3_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/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x5aafc1e8ccd157f14d99616c1a6362c0e4e982e8d0960b3cec6b8535be2dd262",
-                    "mixHash" : "0x3147e2d69de5128f6325af44e7d4f02df73eb47de9d78ba5dfb1caa450bf04f2",
-                    "nonce" : "0xd714271208ab7e67",
+                    "hash" : "0x18f566671d8c764349cd80852739f0799845109598d541af54a22643a9413a6d",
+                    "mixHash" : "0xa5bb08bacad89a2dfd7bf3cec3c176f6c40c9b6cfd228b42e991c04a6d13e5f5",
+                    "nonce" : "0x21595471a1fae286",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
-                    "stateRoot" : "0x62311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7b",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a03147e2d69de5128f6325af44e7d4f02df73eb47de9d78ba5dfb1caa450bf04f288d714271208ab7e67f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a5bb08bacad89a2dfd7bf3cec3c176f6c40c9b6cfd228b42e991c04a6d13e5f58821595471a1fae286f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5aafc1e8ccd157f14d99616c1a6362c0e4e982e8d0960b3cec6b8535be2dd262",
-        "network" : "EIP150",
+        "lastblockhash" : "0x18f566671d8c764349cd80852739f0799845109598d541af54a22643a9413a6d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_3_d0g0v0_EIP158" : {
+    "CALLCODESha256_3_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xa8ed3219236bc9e285e51f1c1c78d062582ade96b6733de11a09e730d5c453c8",
+                    "mixHash" : "0xe1af91057ac0df40b84d69aa08323fae4dba79a29efa999799ec9c55915cef50",
+                    "nonce" : "0xb765cb57633b2577",
+                    "number" : "0x01",
+                    "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0e1af91057ac0df40b84d69aa08323fae4dba79a29efa999799ec9c55915cef5088b765cb57633b2577f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x77e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa8ed3219236bc9e285e51f1c1c78d062582ade96b6733de11a09e730d5c453c8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_3_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/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0xcf9d1603903fa35c14d64cb1bd7b780e9010eb72c6651989534adba34da1a7e3",
-                    "mixHash" : "0x55eb5501c03b46d7e91e547f9cd3da43086e3be610d58143af8beba8aa775ddb",
-                    "nonce" : "0x4b5a800a8344f46f",
+                    "hash" : "0x6baeb55194cf98e687a09ac4748c98f71e5cf9db72e363b0269f8ac81ee0c189",
+                    "mixHash" : "0x806b9045f400864024d9fe785bdd459c0615a2e0d1d184457fcff4fdda41f28b",
+                    "nonce" : "0x88c5a8f91205ccea",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
                     "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a055eb5501c03b46d7e91e547f9cd3da43086e3be610d58143af8beba8aa775ddb884b5a800a8344f46ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0806b9045f400864024d9fe785bdd459c0615a2e0d1d184457fcff4fdda41f28b8888c5a8f91205cceaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf9d1603903fa35c14d64cb1bd7b780e9010eb72c6651989534adba34da1a7e3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6baeb55194cf98e687a09ac4748c98f71e5cf9db72e363b0269f8ac81ee0c189",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_3_d0g0v0_Frontier" : {
+    "CALLCODESha256_3_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/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeef4",
-                    "hash" : "0x64359876349e8f3de81acfdae11c385f8522ba9052c091326f2871dfa883c026",
-                    "mixHash" : "0x2876f09438496f16c524414892a4625a5610f68eda14c957d44819ff1676dbbb",
-                    "nonce" : "0xfbf1ea78000f0b52",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xd168a8b3bf7197dbbfcb3b530b37c3a11d4867bc4e31b4846584c82b7165a27d",
+                    "mixHash" : "0x1eeff10d0280e2d9971545ea521a8c8f2452656af5d3c2f5f3efa25c7426686e",
+                    "nonce" : "0x06242a7ce26dbe3a",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
-                    "stateRoot" : "0x77b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56b",
+                    "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
+                    "stateRoot" : "0x62311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a02876f09438496f16c524414892a4625a5610f68eda14c957d44819ff1676dbbb88fbf1ea78000f0b52f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a01eeff10d0280e2d9971545ea521a8c8f2452656af5d3c2f5f3efa25c7426686e8806242a7ce26dbe3af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x64359876349e8f3de81acfdae11c385f8522ba9052c091326f2871dfa883c026",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd168a8b3bf7197dbbfcb3b530b37c3a11d4867bc4e31b4846584c82b7165a27d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eef4",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a6c",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_3_d0g0v0_Homestead" : {
+    "CALLCODESha256_3_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/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeef4",
-                    "hash" : "0xa3dcb622051285f85708246af5ce3c6bd926392f70b32098d0d39be06b544850",
-                    "mixHash" : "0x935a208ee67430a498a5d5c91aaff0d40039c9b1dc8509787f01167cbdef9e11",
-                    "nonce" : "0xc0cf1aa657674627",
+                    "hash" : "0xb52430d09b429826c265adedda672e9938624180113554cef12aca0fbddbc15d",
+                    "mixHash" : "0xed8b10ff1ed51a1355dcea10ff746eff2fd418f807c38e3cffa64f7c6f6dbb99",
+                    "nonce" : "0x6a5aff603ca77e93",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
                     "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0935a208ee67430a498a5d5c91aaff0d40039c9b1dc8509787f01167cbdef9e1188c0cf1aa657674627f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0ed8b10ff1ed51a1355dcea10ff746eff2fd418f807c38e3cffa64f7c6f6dbb99886a5aff603ca77e93f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3dcb622051285f85708246af5ce3c6bd926392f70b32098d0d39be06b544850",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb52430d09b429826c265adedda672e9938624180113554cef12aca0fbddbc15d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_3_d0g0v0_Metropolis" : {
+    "CALLCODESha256_3_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/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0xb4702909ea9d944b89211f5c01f0f511a31f7da3e9d09901bcae309fe1d18a05",
-                    "mixHash" : "0x75917d9398f7ab520e5576b092105457b489fe461c612e53f50152d5572f5bb5",
-                    "nonce" : "0xb97a2c52743b8d61",
+                    "gasUsed" : "0xeef4",
+                    "hash" : "0x4daa12ac5de3f9e2d49c11ef887f2222d2fd43f7db1534765a8755637eb2f9b9",
+                    "mixHash" : "0x54cb8ecf960032aa2e7c084f5a7c75925055fa6855df8bf2d00a72022e038a96",
+                    "nonce" : "0xf148b44aa64d0302",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
+                    "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
+                    "stateRoot" : "0x77b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a075917d9398f7ab520e5576b092105457b489fe461c612e53f50152d5572f5bb588b97a2c52743b8d61f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a054cb8ecf960032aa2e7c084f5a7c75925055fa6855df8bf2d00a72022e038a9688f148b44aa64d0302f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4702909ea9d944b89211f5c01f0f511a31f7da3e9d09901bcae309fe1d18a05",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4daa12ac5de3f9e2d49c11ef887f2222d2fd43f7db1534765a8755637eb2f9b9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f4eef4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a7618a6c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0.json
index 240fb5d26..2eabf0171 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_3_postfix0_d0g0v0_EIP150" : {
+    "CALLCODESha256_3_postfix0_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/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x6b29f772baddf6c8b25651b3fdf5aa55759a12a0c286ae96917f7dda718f38d9",
-                    "mixHash" : "0xba09e23cd59bd23013214e45c70791aaa9ab6f982f4a260a4f26eb95475b5163",
-                    "nonce" : "0xc8c74683d48d3d39",
+                    "hash" : "0x8580642ac7ac467e183b81888d21384d485f71279004e2f98e363ebd57343fbe",
+                    "mixHash" : "0xbd3a14ea12d0aa0ef8517b0b2846fecf4c3841342216e17ce39eea419eacdd09",
+                    "nonce" : "0x9c77110eaa636beb",
                     "number" : "0x01",
                     "parentHash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
-                    "receiptTrie" : "0x50b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6e",
-                    "stateRoot" : "0x170253a736384a9b31529cec03611cc6d3dda3c44eabe70d22e0db24022085ca",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x517d7924386e77d95db49517f300e0c6c971e01003c79e7718736fee40c4f93d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0170253a736384a9b31529cec03611cc6d3dda3c44eabe70d22e0db24022085caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba050b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0ba09e23cd59bd23013214e45c70791aaa9ab6f982f4a260a4f26eb95475b516388c8c74683d48d3d39f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517d7924386e77d95db49517f300e0c6c971e01003c79e7718736fee40c4f93da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0bd3a14ea12d0aa0ef8517b0b2846fecf4c3841342216e17ce39eea419eacdd09889c77110eaa636bebf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b29f772baddf6c8b25651b3fdf5aa55759a12a0c286ae96917f7dda718f38d9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8580642ac7ac467e183b81888d21384d485f71279004e2f98e363ebd57343fbe",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x65f34578907f006000526020600060256000600060026101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_3_postfix0_d0g0v0_EIP158" : {
+    "CALLCODESha256_3_postfix0_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x0ac5c0e944278a843fce6e3a76a3b1f31e4e056d38ae0b4716604e37af69bbfb",
+                    "mixHash" : "0xa7a126870553f944fda210ceb828d7affd91ec95b3b65ee5848b10f4bff7d12f",
+                    "nonce" : "0x95e453c1aec11381",
+                    "number" : "0x01",
+                    "parentHash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x517d7924386e77d95db49517f300e0c6c971e01003c79e7718736fee40c4f93d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517d7924386e77d95db49517f300e0c6c971e01003c79e7718736fee40c4f93da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a7a126870553f944fda210ceb828d7affd91ec95b3b65ee5848b10f4bff7d12f8895e453c1aec11381f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0ac5c0e944278a843fce6e3a76a3b1f31e4e056d38ae0b4716604e37af69bbfb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x65f34578907f006000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x3b745a1c00d035c334f358d007a430e4cf0ae63aa0556fb05529706de546464d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x65f34578907f006000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_3_postfix0_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/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0xd5676377849745e07a0adfc7af16ee12fb9b5a7714ed459d7ac161dcc71c3229",
-                    "mixHash" : "0x0ae108877881eab1d95a49394bc5ee5ef40f1e8944050dfbf679ad285a105ae6",
-                    "nonce" : "0x2485811f5ecfb04a",
+                    "hash" : "0xd5cf88ea920feae7575624b3c91342905ba4d2ede4a6dac2381d4a33a3c0a7f9",
+                    "mixHash" : "0x175172586339c52fcbeea42693a5c3f2c03b6e072f46c7bb6a6e177ead12ae02",
+                    "nonce" : "0x762ef794761ae079",
                     "number" : "0x01",
                     "parentHash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
                     "receiptTrie" : "0x50b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6e",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0170253a736384a9b31529cec03611cc6d3dda3c44eabe70d22e0db24022085caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba050b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a00ae108877881eab1d95a49394bc5ee5ef40f1e8944050dfbf679ad285a105ae6882485811f5ecfb04af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0170253a736384a9b31529cec03611cc6d3dda3c44eabe70d22e0db24022085caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba050b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0175172586339c52fcbeea42693a5c3f2c03b6e072f46c7bb6a6e177ead12ae0288762ef794761ae079f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5676377849745e07a0adfc7af16ee12fb9b5a7714ed459d7ac161dcc71c3229",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd5cf88ea920feae7575624b3c91342905ba4d2ede4a6dac2381d4a33a3c0a7f9",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_3_postfix0_d0g0v0_Frontier" : {
+    "CALLCODESha256_3_postfix0_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/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeef4",
-                    "hash" : "0x16171a4556518e2afa3028d0a3ee6851cd29ef35f7ad569c01c20efe6e1f793b",
-                    "mixHash" : "0x0f0793496788519b5a602334e91fe294679adb9798de6ef4323c7837ef1a1881",
-                    "nonce" : "0xaed45bcc708a30e9",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x2ded2453eebfa9ef98e2dd51480655e0fa4fe1d163a446d81dd5f9764490fbd4",
+                    "mixHash" : "0x09233914638e4ee1a9718c9961fde8abc00ab22f49618d02445b48bced05da67",
+                    "nonce" : "0x91696b131bc29bfa",
                     "number" : "0x01",
                     "parentHash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
-                    "receiptTrie" : "0xef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53",
-                    "stateRoot" : "0x2bf64f6957556d9ca520515228b74da6edf5df81e7aa6d4089082070f4d90e95",
+                    "receiptTrie" : "0x50b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6e",
+                    "stateRoot" : "0x170253a736384a9b31529cec03611cc6d3dda3c44eabe70d22e0db24022085ca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bf64f6957556d9ca520515228b74da6edf5df81e7aa6d4089082070f4d90e95a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a00f0793496788519b5a602334e91fe294679adb9798de6ef4323c7837ef1a188188aed45bcc708a30e9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0170253a736384a9b31529cec03611cc6d3dda3c44eabe70d22e0db24022085caa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba050b2daf8c6a00ff0bc44a4b566b7fa727e9927cf4f2db9b686afdd9b6e148f6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a009233914638e4ee1a9718c9961fde8abc00ab22f49618d02445b48bced05da678891696b131bc29bfaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16171a4556518e2afa3028d0a3ee6851cd29ef35f7ad569c01c20efe6e1f793b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2ded2453eebfa9ef98e2dd51480655e0fa4fe1d163a446d81dd5f9764490fbd4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eef4",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a6c",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_3_postfix0_d0g0v0_Homestead" : {
+    "CALLCODESha256_3_postfix0_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/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeef4",
-                    "hash" : "0x7e123a03f3b92deaa8ce10fa7aa10496798c7ac1471bfb94e73009103ded52db",
-                    "mixHash" : "0xc72ddb1e07d1611842d745179dcef185964d7fc03227f530b964716f9fd45a1c",
-                    "nonce" : "0xf399f073cc9e30ce",
+                    "hash" : "0xd288f15db295abfaf72301125574db122a37d718184932bd3b617945cc176e3b",
+                    "mixHash" : "0x42befd40ad6dd355bb6370a43fb73aad204aababc2f86ec99206cf9b89515be9",
+                    "nonce" : "0xa4143ec496462d01",
                     "number" : "0x01",
                     "parentHash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
                     "receiptTrie" : "0xef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bf64f6957556d9ca520515228b74da6edf5df81e7aa6d4089082070f4d90e95a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0c72ddb1e07d1611842d745179dcef185964d7fc03227f530b964716f9fd45a1c88f399f073cc9e30cef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bf64f6957556d9ca520515228b74da6edf5df81e7aa6d4089082070f4d90e95a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a042befd40ad6dd355bb6370a43fb73aad204aababc2f86ec99206cf9b89515be988a4143ec496462d01f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e123a03f3b92deaa8ce10fa7aa10496798c7ac1471bfb94e73009103ded52db",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd288f15db295abfaf72301125574db122a37d718184932bd3b617945cc176e3b",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_3_postfix0_d0g0v0_Metropolis" : {
+    "CALLCODESha256_3_postfix0_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/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x98c7810510e33fb87f80e5a8f65b398b4c183940619cdcc64272ac347d13d585",
-                    "mixHash" : "0x8a61fd0738cffbc8e55af8d5abb8633564c48826bb078ffb648f8303c12a51e9",
-                    "nonce" : "0x38bc3b4753396dba",
+                    "gasUsed" : "0xeef4",
+                    "hash" : "0x26bc78529256fb9492ed424ced1868487c95bf2ab29b6ac467fdabe940a5e0fc",
+                    "mixHash" : "0x2f11815c25b872848673b53b21f05c7b425e801ce82834a68657b98507fcdd10",
+                    "nonce" : "0x9bce02b040dd9a11",
                     "number" : "0x01",
                     "parentHash" : "0xeea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x517d7924386e77d95db49517f300e0c6c971e01003c79e7718736fee40c4f93d",
+                    "receiptTrie" : "0xef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53",
+                    "stateRoot" : "0x2bf64f6957556d9ca520515228b74da6edf5df81e7aa6d4089082070f4d90e95",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517d7924386e77d95db49517f300e0c6c971e01003c79e7718736fee40c4f93da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a08a61fd0738cffbc8e55af8d5abb8633564c48826bb078ffb648f8303c12a51e98838bc3b4753396dbaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eea104a3446f5341ec750f2bfebef40415bf12c34e0ba6ae2dbceb0fec1ae184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bf64f6957556d9ca520515228b74da6edf5df81e7aa6d4089082070f4d90e95a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ef4bfa6c07da8c8ca834210b771b8b278411b76cf74a7f73ebee9bc7719d4b53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a02f11815c25b872848673b53b21f05c7b425e801ce82834a68657b98507fcdd10889bce02b040dd9a11f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09db104cf68e105ad9e2c4ef5fc7d61aaa1fdd26ffb90ebc7d39eec6f76857b62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98c7810510e33fb87f80e5a8f65b398b4c183940619cdcc64272ac347d13d585",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x26bc78529256fb9492ed424ced1868487c95bf2ab29b6ac467fdabe940a5e0fc",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x65f34578907f006000526020600060256000600060026101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f4eef4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a7618a6c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json
index 3772e581c..69bf976f7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_3_prefix0_d0g0v0_EIP150" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0xb76b7eb0d68bf6da1a54ff77bdbed919f3e264a14b0cb6c19fa4ca5c6b68aaea",
-                    "mixHash" : "0x89c6cd07964f57a90cf6b04ba2b35d3e2a2e38630b8ae55a760150d5c61b3e2a",
-                    "nonce" : "0x547f1c6f3a314770",
+                    "hash" : "0x3fbe306ed7f2403447f9b2e16d5cb908ae7fad87e01f6d6d757da84b285ae477",
+                    "mixHash" : "0xefac8abdf70bbf0f284658f364982360ecbc684bb57c92f391b711871c40f1c8",
+                    "nonce" : "0x708b97459ddefb26",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
-                    "stateRoot" : "0x62311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7b",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a089c6cd07964f57a90cf6b04ba2b35d3e2a2e38630b8ae55a760150d5c61b3e2a88547f1c6f3a314770f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0efac8abdf70bbf0f284658f364982360ecbc684bb57c92f391b711871c40f1c888708b97459ddefb26f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb76b7eb0d68bf6da1a54ff77bdbed919f3e264a14b0cb6c19fa4ca5c6b68aaea",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3fbe306ed7f2403447f9b2e16d5cb908ae7fad87e01f6d6d757da84b285ae477",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_EIP158" : {
+    "CALLCODESha256_3_prefix0_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xa4bc035b1870da5270c7797a429cf5bf16a2697ec1d522cb7b3f13a4b43d024b",
+                    "mixHash" : "0xa69d403076bae27f2ba891bb0cd29bf9ffce730038dfdec2e99e7eaad2c1bc0c",
+                    "nonce" : "0x2bbeac6180694dca",
+                    "number" : "0x01",
+                    "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a69d403076bae27f2ba891bb0cd29bf9ffce730038dfdec2e99e7eaad2c1bc0c882bbeac6180694dcaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x77e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa4bc035b1870da5270c7797a429cf5bf16a2697ec1d522cb7b3f13a4b43d024b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x99fc29c1ee1b6569350b27f92167bca6f9e642667e50196027630cfcee36bb91",
-                    "mixHash" : "0x668656224b7915892a146419004489fc6891e8de88294c0b775a83b180f967da",
-                    "nonce" : "0xe1b9e99f0fe63bfc",
+                    "hash" : "0x05fdb7ce0511e8b4297c8826e57d2a4eb37fbe14253eec214695684dc5a7a6be",
+                    "mixHash" : "0xb7cfa5f58227f507b6ae6ac33fd3303fb5f51abcbde3a5c6fa18ebe00f2b6cc5",
+                    "nonce" : "0x5b5d64c339135abf",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
                     "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0668656224b7915892a146419004489fc6891e8de88294c0b775a83b180f967da88e1b9e99f0fe63bfcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0b7cfa5f58227f507b6ae6ac33fd3303fb5f51abcbde3a5c6fa18ebe00f2b6cc5885b5d64c339135abff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99fc29c1ee1b6569350b27f92167bca6f9e642667e50196027630cfcee36bb91",
-        "network" : "EIP158",
+        "lastblockhash" : "0x05fdb7ce0511e8b4297c8826e57d2a4eb37fbe14253eec214695684dc5a7a6be",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_Frontier" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeef4",
-                    "hash" : "0x7bf90123ef3036032373587d8c32ad9da1e3e9c9e62f4f3e38aac04747dc95ab",
-                    "mixHash" : "0x18519d39621a8318ee38216ed50366df62fda1fc4bd91f924ae26e2503c2d898",
-                    "nonce" : "0xeca67ac02878701f",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x6700dd05929b08f18dd4da6b3ea06ca3e63a27b9d41a078fff168e63793bab81",
+                    "mixHash" : "0x226165b5d3fbf86bff809388cc7945c1d6c6f50ee4316fcf74f54ca19b8e6e19",
+                    "nonce" : "0xd5f57afc23bcd547",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
-                    "stateRoot" : "0x77b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56b",
+                    "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
+                    "stateRoot" : "0x62311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a018519d39621a8318ee38216ed50366df62fda1fc4bd91f924ae26e2503c2d89888eca67ac02878701ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0226165b5d3fbf86bff809388cc7945c1d6c6f50ee4316fcf74f54ca19b8e6e1988d5f57afc23bcd547f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bf90123ef3036032373587d8c32ad9da1e3e9c9e62f4f3e38aac04747dc95ab",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6700dd05929b08f18dd4da6b3ea06ca3e63a27b9d41a078fff168e63793bab81",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eef4",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a6c",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_Homestead" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeef4",
-                    "hash" : "0xd3776e2985f951688ff32b34fcaa22939970e73d5deab3529daccf6055e1f8df",
-                    "mixHash" : "0xad4ad7b4b2612098c83a8f05cecfe80e58e06ff4397360a4b9145feb8e66d390",
-                    "nonce" : "0x7357f7e15e7d4228",
+                    "hash" : "0x6e97bd556bb959b633930f8f76d8acc44597c2fd1f897fd25c65c3414741f0b5",
+                    "mixHash" : "0x203ff1729f2d9885cfa0d60c4d233c48060cc0bc26fd4a08332d6cd49366a5ca",
+                    "nonce" : "0x7e3037ea18a1835a",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
                     "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0ad4ad7b4b2612098c83a8f05cecfe80e58e06ff4397360a4b9145feb8e66d390887357f7e15e7d4228f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0203ff1729f2d9885cfa0d60c4d233c48060cc0bc26fd4a08332d6cd49366a5ca887e3037ea18a1835af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3776e2985f951688ff32b34fcaa22939970e73d5deab3529daccf6055e1f8df",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6e97bd556bb959b633930f8f76d8acc44597c2fd1f897fd25c65c3414741f0b5",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_Metropolis" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x33efdeacbd3d10e763b6c21cff5cffeabf41500d07ec0c170e0978e870807b1c",
-                    "mixHash" : "0xa72a693c99468ccb88f7730c2af61096e01f917fc64ce7eacffd14efb2eedc33",
-                    "nonce" : "0x9ab3b00d5f91a1fa",
+                    "gasUsed" : "0xeef4",
+                    "hash" : "0x04570ac25a95d9210da1274933c89014f205a39f48f1c65da03de29e7562c584",
+                    "mixHash" : "0xc28cb6f68f9d6d1a0de631cf1a6d05196e7e063b348ff95582edb2439e421a3c",
+                    "nonce" : "0x4b3d7ba62b109669",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
+                    "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
+                    "stateRoot" : "0x77b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a72a693c99468ccb88f7730c2af61096e01f917fc64ce7eacffd14efb2eedc33889ab3b00d5f91a1faf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0c28cb6f68f9d6d1a0de631cf1a6d05196e7e063b348ff95582edb2439e421a3c884b3d7ba62b109669f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33efdeacbd3d10e763b6c21cff5cffeabf41500d07ec0c170e0978e870807b1c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x04570ac25a95d9210da1274933c89014f205a39f48f1c65da03de29e7562c584",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f4eef4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a7618a6c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_d0g0v0.json
index 59f1c2d71..c8217630e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_4_d0g0v0_EIP150" : {
+    "CALLCODESha256_4_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/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf179",
-                    "hash" : "0xd8cdaafaef2e3d3e63083c7107f8f89c121e246e48c12dad132c9e8e2d6011a3",
-                    "mixHash" : "0x5cb94a302ce11cb731cd8d8be6158733ae38b668440b85c8f029ca85786ca255",
-                    "nonce" : "0x9f1d1a53400fa32a",
+                    "hash" : "0xa83c8d31eb71a83c92ee76525221a00ddf997c16b769cc7b7ff1936541f35837",
+                    "mixHash" : "0x651fd526a65f0f9385017d227876e351dbe33ffead958eee69c51dccb8fc01e1",
+                    "nonce" : "0x805317b12eab866c",
                     "number" : "0x01",
                     "parentHash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
-                    "receiptTrie" : "0x73a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2",
-                    "stateRoot" : "0x9c3e3d7fd6f88b0f28fcd3eb171247299e052a5512e559ca65c446864e6d738c",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0xd040ee5beda882e43c7d687882ffa30b0dabc0322ec4690cf0243ec6695040d9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c3e3d7fd6f88b0f28fcd3eb171247299e052a5512e559ca65c446864e6d738ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba073a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a05cb94a302ce11cb731cd8d8be6158733ae38b668440b85c8f029ca85786ca255889f1d1a53400fa32af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d040ee5beda882e43c7d687882ffa30b0dabc0322ec4690cf0243ec6695040d9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0651fd526a65f0f9385017d227876e351dbe33ffead958eee69c51dccb8fc01e188805317b12eab866cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8cdaafaef2e3d3e63083c7107f8f89c121e246e48c12dad132c9e8e2d6011a3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa83c8d31eb71a83c92ee76525221a00ddf997c16b769cc7b7ff1936541f35837",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_4_d0g0v0_EIP158" : {
+    "CALLCODESha256_4_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0x3a10f74eab818c7e8e6506d4a45fe0ac873ae4cb719a4abb69be78708dbe452b",
+                    "mixHash" : "0xfb030231701b43a0b2e1cb8a62e6089ad2606b6c73f9b4dee3d928b710fce45f",
+                    "nonce" : "0x4ebf6feb6dce475a",
+                    "number" : "0x01",
+                    "parentHash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0xd040ee5beda882e43c7d687882ffa30b0dabc0322ec4690cf0243ec6695040d9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d040ee5beda882e43c7d687882ffa30b0dabc0322ec4690cf0243ec6695040d9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0fb030231701b43a0b2e1cb8a62e6089ad2606b6c73f9b4dee3d928b710fce45f884ebf6feb6dce475af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a10f74eab818c7e8e6506d4a45fe0ac873ae4cb719a4abb69be78708dbe452b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f179",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187e7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_4_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/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf179",
-                    "hash" : "0x65453e9a28a2c01acc173a305c442668934ab02e48642ae364c554699ce6c157",
-                    "mixHash" : "0xb1d032250168a6f5cf489927f4d26611a44e69954fe14bbf2a1ea79d3d30027d",
-                    "nonce" : "0xa660b5278606c41c",
+                    "hash" : "0xd22218d38f350e26ba54d4b54d6c490ae55d929195e4183249f7d64df8b6bfa0",
+                    "mixHash" : "0x2cff3448c3611aefca449c073ebfc1efd34750578da19daea58457927742c0d7",
+                    "nonce" : "0xcc3f2b18af9fbf31",
                     "number" : "0x01",
                     "parentHash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
                     "receiptTrie" : "0x73a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c3e3d7fd6f88b0f28fcd3eb171247299e052a5512e559ca65c446864e6d738ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba073a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0b1d032250168a6f5cf489927f4d26611a44e69954fe14bbf2a1ea79d3d30027d88a660b5278606c41cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c3e3d7fd6f88b0f28fcd3eb171247299e052a5512e559ca65c446864e6d738ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba073a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a02cff3448c3611aefca449c073ebfc1efd34750578da19daea58457927742c0d788cc3f2b18af9fbf31f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65453e9a28a2c01acc173a305c442668934ab02e48642ae364c554699ce6c157",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd22218d38f350e26ba54d4b54d6c490ae55d929195e4183249f7d64df8b6bfa0",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_4_d0g0v0_Frontier" : {
+    "CALLCODESha256_4_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/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeee5",
-                    "hash" : "0xa837c1f4056ba25bc844308426f3bf39880826ddab003a687ed48f0ba051a1e2",
-                    "mixHash" : "0xc8e77f52b13845f79ef54eb1228bfaa626c5d5df83f5fb4da5d050fa7d581201",
-                    "nonce" : "0x80324d819e39d80d",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0x3b7b425a3fe08fd24476d267968e9745e7579e58ef610a7cda52dec4f445a3ca",
+                    "mixHash" : "0x507f2b043771d8ba6779943a99b6f35fc2f2b5d5b6c01e520d8775b4c13fbb1c",
+                    "nonce" : "0xe1fd743d9e0fb004",
                     "number" : "0x01",
                     "parentHash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
-                    "receiptTrie" : "0xe4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5",
-                    "stateRoot" : "0x8bdd3e4d3cec7bbc433dc562d6b71751f956503387ef2eb6804879b0ba289075",
+                    "receiptTrie" : "0x73a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2",
+                    "stateRoot" : "0x9c3e3d7fd6f88b0f28fcd3eb171247299e052a5512e559ca65c446864e6d738c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bdd3e4d3cec7bbc433dc562d6b71751f956503387ef2eb6804879b0ba289075a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a0c8e77f52b13845f79ef54eb1228bfaa626c5d5df83f5fb4da5d050fa7d5812018880324d819e39d80df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c3e3d7fd6f88b0f28fcd3eb171247299e052a5512e559ca65c446864e6d738ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba073a933ca87d59813eae3703a42ebab60a1cd8589f8d5e2b4038acc8aa624f2a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0507f2b043771d8ba6779943a99b6f35fc2f2b5d5b6c01e520d8775b4c13fbb1c88e1fd743d9e0fb004f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa837c1f4056ba25bc844308426f3bf39880826ddab003a687ed48f0ba051a1e2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3b7b425a3fe08fd24476d267968e9745e7579e58ef610a7cda52dec4f445a3ca",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eee5",
+                "balance" : "0x4563918244f4f179",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a7b",
+                "balance" : "0x0de0b6b3a76187e7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_4_d0g0v0_Homestead" : {
+    "CALLCODESha256_4_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/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeee5",
-                    "hash" : "0x8c522dc5782d65dc090c16002247ebd2bb07c78ff9bba6c0b22e6e1dd099b65a",
-                    "mixHash" : "0xefc6f2d1714f2db89267e501033f591d7e09bd2b5c572e1cf9c7ce8f102ae8b5",
-                    "nonce" : "0x3a53ad523d6d2aad",
+                    "hash" : "0x7c285a116cdd21167f77f52f5b99a7b20c98a192952bbf238bd74a6ead09f300",
+                    "mixHash" : "0xce49eca3ad796fcde871bfd2b846ebccfd4a9790cd385a55094349bdca169739",
+                    "nonce" : "0x40f65cb32f2d9c54",
                     "number" : "0x01",
                     "parentHash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
                     "receiptTrie" : "0xe4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bdd3e4d3cec7bbc433dc562d6b71751f956503387ef2eb6804879b0ba289075a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a0efc6f2d1714f2db89267e501033f591d7e09bd2b5c572e1cf9c7ce8f102ae8b5883a53ad523d6d2aadf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bdd3e4d3cec7bbc433dc562d6b71751f956503387ef2eb6804879b0ba289075a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a0ce49eca3ad796fcde871bfd2b846ebccfd4a9790cd385a55094349bdca1697398840f65cb32f2d9c54f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c522dc5782d65dc090c16002247ebd2bb07c78ff9bba6c0b22e6e1dd099b65a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7c285a116cdd21167f77f52f5b99a7b20c98a192952bbf238bd74a6ead09f300",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_4_d0g0v0_Metropolis" : {
+    "CALLCODESha256_4_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/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf179",
-                    "hash" : "0xb531df16b4b309bae3030a0fb88514775659c0d201e94d801dcd83ba9fafdac1",
-                    "mixHash" : "0x4fb98cba385f637aedc673c5f29d311fb72d7c6c6bc5758a2abd1ffade3dce3b",
-                    "nonce" : "0x3fcbb9c62293528e",
+                    "gasUsed" : "0xeee5",
+                    "hash" : "0xbb99e249f8de13162c527c4c94e99c6ceca7346577478b7bbaf796a8b15d57c6",
+                    "mixHash" : "0xdb62028e0ca31ee2f5beea46b883fdd690b1f71498cf45ca0b78b21f76ea791c",
+                    "nonce" : "0x236e92c4d36af1df",
                     "number" : "0x01",
                     "parentHash" : "0x3100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2e",
-                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
-                    "stateRoot" : "0xd040ee5beda882e43c7d687882ffa30b0dabc0322ec4690cf0243ec6695040d9",
+                    "receiptTrie" : "0xe4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5",
+                    "stateRoot" : "0x8bdd3e4d3cec7bbc433dc562d6b71751f956503387ef2eb6804879b0ba289075",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d040ee5beda882e43c7d687882ffa30b0dabc0322ec4690cf0243ec6695040d9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a04fb98cba385f637aedc673c5f29d311fb72d7c6c6bc5758a2abd1ffade3dce3b883fcbb9c62293528ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03100e213ef72d7fa68f6b7cc7c84fa23dfe3e0e0ebac59e5ce1266047b9f2f2ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bdd3e4d3cec7bbc433dc562d6b71751f956503387ef2eb6804879b0ba289075a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4146223ef65db4336241e7b0569f243a37c32943b9f7ea59cdf487ccc32afd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a0db62028e0ca31ee2f5beea46b883fdd690b1f71498cf45ca0b78b21f76ea791c88236e92c4d36af1dff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086dbdf030c5b24ac5e311932c78fd9ee817bb4355d95214b005be069b19f2c5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb531df16b4b309bae3030a0fb88514775659c0d201e94d801dcd83ba9fafdac1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbb99e249f8de13162c527c4c94e99c6ceca7346577478b7bbaf796a8b15d57c6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f179",
+                "balance" : "0x4563918244f4eee5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187e7",
+                "balance" : "0x0de0b6b3a7618a7b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0.json
index c6fed65a2..6c12f7bd0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_4_gas99_d0g0v0_EIP150" : {
+    "CALLCODESha256_4_gas99_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/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf179",
-                    "hash" : "0xe29327d060c47892dfd3cb87f4228d85115125ef235e0bb97e23a6273e71076d",
-                    "mixHash" : "0x354e34a7fd83541a03a5cc4b834ebac9b39913289d24e0b79281d5b55c785531",
-                    "nonce" : "0x795f05b3fdcfc62b",
+                    "hash" : "0x96179ff362c9be8ac4fd840bca2f5b1c64fabe63ec68e1fe35b7942d5f087b63",
+                    "mixHash" : "0x981e339af59c6bfa9a053a16c98667aee4fe65ee7bfa076b902257910056f447",
+                    "nonce" : "0xdc780239ab2ec344",
                     "number" : "0x01",
                     "parentHash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
-                    "receiptTrie" : "0xa8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854d",
-                    "stateRoot" : "0x4bf3f7ce1aecead9dec72202f83fa5d9fb037c435c537d127f9bcd25eff9afcf",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0xc92136790f4863140275d7c6b6daad11dc5d88e1fdd5319fa1a58598bbdb1d4f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bf3f7ce1aecead9dec72202f83fa5d9fb037c435c537d127f9bcd25eff9afcfa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0354e34a7fd83541a03a5cc4b834ebac9b39913289d24e0b79281d5b55c78553188795f05b3fdcfc62bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c92136790f4863140275d7c6b6daad11dc5d88e1fdd5319fa1a58598bbdb1d4fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0981e339af59c6bfa9a053a16c98667aee4fe65ee7bfa076b902257910056f44788dc780239ab2ec344f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe29327d060c47892dfd3cb87f4228d85115125ef235e0bb97e23a6273e71076d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x96179ff362c9be8ac4fd840bca2f5b1c64fabe63ec68e1fe35b7942d5f087b63",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_4_gas99_d0g0v0_EIP158" : {
+    "CALLCODESha256_4_gas99_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0xbcf8ba8a1a36a6e5fb5bd6981ede026d6137191456fbde3d48650f027046d697",
+                    "mixHash" : "0xab22a35b6c2954484dc98f5b1131d3fe42c034274a309345e8367825545a08a0",
+                    "nonce" : "0x00c78b2453b3a039",
+                    "number" : "0x01",
+                    "parentHash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0xc92136790f4863140275d7c6b6daad11dc5d88e1fdd5319fa1a58598bbdb1d4f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c92136790f4863140275d7c6b6daad11dc5d88e1fdd5319fa1a58598bbdb1d4fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0ab22a35b6c2954484dc98f5b1131d3fe42c034274a309345e8367825545a08a08800c78b2453b3a039f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x32cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbcf8ba8a1a36a6e5fb5bd6981ede026d6137191456fbde3d48650f027046d697",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f179",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187e7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_4_gas99_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/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf179",
-                    "hash" : "0x71bd4bf004aa2d05ba661507cd2dcf51744a4bda9142e6df50c8778ad17d730f",
-                    "mixHash" : "0x374c16be6159b30a16f65f63ea7d335b4238ed3bbed371fe3f06a5a18fa72f4c",
-                    "nonce" : "0x54dc0f43cdc279ba",
+                    "hash" : "0x1d73efdb22f9219d47d02285a8707c022d983f686434089247768f636697e906",
+                    "mixHash" : "0x6bf1d843af0f6725c9486d68303e4d593024914fa3f6da7177a88f95a46c6395",
+                    "nonce" : "0xd804c62436e09436",
                     "number" : "0x01",
                     "parentHash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
                     "receiptTrie" : "0xa8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854d",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bf3f7ce1aecead9dec72202f83fa5d9fb037c435c537d127f9bcd25eff9afcfa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0374c16be6159b30a16f65f63ea7d335b4238ed3bbed371fe3f06a5a18fa72f4c8854dc0f43cdc279baf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bf3f7ce1aecead9dec72202f83fa5d9fb037c435c537d127f9bcd25eff9afcfa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a06bf1d843af0f6725c9486d68303e4d593024914fa3f6da7177a88f95a46c639588d804c62436e09436f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71bd4bf004aa2d05ba661507cd2dcf51744a4bda9142e6df50c8778ad17d730f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1d73efdb22f9219d47d02285a8707c022d983f686434089247768f636697e906",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_4_gas99_d0g0v0_Frontier" : {
+    "CALLCODESha256_4_gas99_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/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeee5",
-                    "hash" : "0x6039d6ed3a60913465a427d2150db86e761543edd26d2ae7400328cfca677baf",
-                    "mixHash" : "0x77f3d2a352e1cd9cb84543b42e1df4d9a52509107f457f398fe7dcb1d690ba02",
-                    "nonce" : "0x59879c5bb774d3db",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0xec7699e859ed8a9020c1c0eeced63729b11412767c216130afc3062dbd86deab",
+                    "mixHash" : "0x47de8f0af7ae6b7ce64f3b95f0eba930695c1270eca81fdb6cca62a4461b8d65",
+                    "nonce" : "0x4d75a95f57280fe0",
                     "number" : "0x01",
                     "parentHash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
-                    "receiptTrie" : "0xe34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37",
-                    "stateRoot" : "0x6c1c7ec438d0ea0060929731908c243fb268edcebc7b6887cf64c633ea0dd5f6",
+                    "receiptTrie" : "0xa8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854d",
+                    "stateRoot" : "0x4bf3f7ce1aecead9dec72202f83fa5d9fb037c435c537d127f9bcd25eff9afcf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c1c7ec438d0ea0060929731908c243fb268edcebc7b6887cf64c633ea0dd5f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a077f3d2a352e1cd9cb84543b42e1df4d9a52509107f457f398fe7dcb1d690ba028859879c5bb774d3dbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bf3f7ce1aecead9dec72202f83fa5d9fb037c435c537d127f9bcd25eff9afcfa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a8d5e1707a67d295e3e9e2c9cb2b545ca5ade190c0877f7c314a68da6dc8854db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a047de8f0af7ae6b7ce64f3b95f0eba930695c1270eca81fdb6cca62a4461b8d65884d75a95f57280fe0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6039d6ed3a60913465a427d2150db86e761543edd26d2ae7400328cfca677baf",
-        "network" : "Frontier",
+        "lastblockhash" : "0xec7699e859ed8a9020c1c0eeced63729b11412767c216130afc3062dbd86deab",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eee5",
+                "balance" : "0x4563918244f4f179",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a7b",
+                "balance" : "0x0de0b6b3a76187e7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_4_gas99_d0g0v0_Homestead" : {
+    "CALLCODESha256_4_gas99_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/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeee5",
-                    "hash" : "0xc2e6c98bba276f1394f39ae0f3c7aeb40bfd276d30d35b69958204233c669364",
-                    "mixHash" : "0x0add90b221b50ecb18ee7fb8c6c7f7c4ef1747962dd5cd7f16ca4cc34bc18c5d",
-                    "nonce" : "0x27ecdb51e68ceb4a",
+                    "hash" : "0x1c0923b540e38ef72707028cf25b536c40d6861f02041f27438158dc9ac24f1f",
+                    "mixHash" : "0xe3b6606e6411c3e10eb2ad4c864e54eb9f8e5c7910d1362a0add2aa62912e305",
+                    "nonce" : "0xdef7916113c7a28b",
                     "number" : "0x01",
                     "parentHash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
                     "receiptTrie" : "0xe34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c1c7ec438d0ea0060929731908c243fb268edcebc7b6887cf64c633ea0dd5f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a00add90b221b50ecb18ee7fb8c6c7f7c4ef1747962dd5cd7f16ca4cc34bc18c5d8827ecdb51e68ceb4af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c1c7ec438d0ea0060929731908c243fb268edcebc7b6887cf64c633ea0dd5f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a0e3b6606e6411c3e10eb2ad4c864e54eb9f8e5c7910d1362a0add2aa62912e30588def7916113c7a28bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2e6c98bba276f1394f39ae0f3c7aeb40bfd276d30d35b69958204233c669364",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1c0923b540e38ef72707028cf25b536c40d6861f02041f27438158dc9ac24f1f",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_4_gas99_d0g0v0_Metropolis" : {
+    "CALLCODESha256_4_gas99_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/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf179",
-                    "hash" : "0x47036a706a38795b86226772c9f3c2729516d9bcd4f6fb39cbae5281053e96fd",
-                    "mixHash" : "0x264c724cb58d2a2fb58664df3b73ed6e5bcf9c71c2c5b01870e377d51367f462",
-                    "nonce" : "0x61c903c45b854706",
+                    "gasUsed" : "0xeee5",
+                    "hash" : "0x87971779f93d4827782c4a45c455395ebe34181b4c5f0df8d1b6f9620d6865be",
+                    "mixHash" : "0xffdff7b565214ae1cb5afccb3f2eca274eb53451b634101030dbe48c97c81693",
+                    "nonce" : "0x9707443eff928766",
                     "number" : "0x01",
                     "parentHash" : "0x5ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51",
-                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
-                    "stateRoot" : "0xc92136790f4863140275d7c6b6daad11dc5d88e1fdd5319fa1a58598bbdb1d4f",
+                    "receiptTrie" : "0xe34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37",
+                    "stateRoot" : "0x6c1c7ec438d0ea0060929731908c243fb268edcebc7b6887cf64c633ea0dd5f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c92136790f4863140275d7c6b6daad11dc5d88e1fdd5319fa1a58598bbdb1d4fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0264c724cb58d2a2fb58664df3b73ed6e5bcf9c71c2c5b01870e377d51367f4628861c903c45b854706f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a05ae414c083decbc1ded52a7022d735e2ef922801047f6f6d6dfe6cbddd111a51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c1c7ec438d0ea0060929731908c243fb268edcebc7b6887cf64c633ea0dd5f6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e34af83bf9800582271c47f7b3f908ac8915bcf7009177bf423cf26e71be8f37b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eee58203e880a0ffdff7b565214ae1cb5afccb3f2eca274eb53451b634101030dbe48c97c81693889707443eff928766f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032cbb37b97c6e8fb707de23ef0842942145034a0fc97e3bf443012da8cd2fc0ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47036a706a38795b86226772c9f3c2729516d9bcd4f6fb39cbae5281053e96fd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x87971779f93d4827782c4a45c455395ebe34181b4c5f0df8d1b6f9620d6865be",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f179",
+                "balance" : "0x4563918244f4eee5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187e7",
+                "balance" : "0x0de0b6b3a7618a7b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json
index 894145dd2..c1149cceb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_5_d0g0v0_EIP150" : {
+    "CALLCODESha256_5_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/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0xef11ef84ef57fdcf646b07b30c49d2b92fb4ea7c82335c55113ace500b722ba9",
-                    "mixHash" : "0xcb6b61c34764940603f7e7efec00ba6245860f8c978b08a90ed70fa4854e4e8d",
-                    "nonce" : "0xf53c081f6dac5f1d",
+                    "hash" : "0x53f4d193dce69919935ae054ed8f711921d2373efb689de670836f00f0d208f1",
+                    "mixHash" : "0x5e4ea911b43e05e9901fdedaa5f43bd79fce3e63a780ca81cab09331edcccd40",
+                    "nonce" : "0xe8e1fb4a6043f5cd",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
-                    "receiptTrie" : "0xab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2b",
-                    "stateRoot" : "0xd9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cb",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0x328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0cb6b61c34764940603f7e7efec00ba6245860f8c978b08a90ed70fa4854e4e8d88f53c081f6dac5f1df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a05e4ea911b43e05e9901fdedaa5f43bd79fce3e63a780ca81cab09331edcccd4088e8e1fb4a6043f5cdf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef11ef84ef57fdcf646b07b30c49d2b92fb4ea7c82335c55113ace500b722ba9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x53f4d193dce69919935ae054ed8f711921d2373efb689de670836f00f0d208f1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_EIP158" : {
+    "CALLCODESha256_5_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/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0xd61cc960e725389fdf1401a54f40f2003b593ae8ed055a442ce23a6c396c3d44",
-                    "mixHash" : "0x9f3da210b4df0dbd4088a457f427346581f2b961e08887a308256ef4a97a5aef",
-                    "nonce" : "0xc73fbedb2b3bb37d",
+                    "hash" : "0x4914bead859236088a0a8421c28859d2c1ff488dab2d44e228be62492b5adec8",
+                    "mixHash" : "0x573c3b20dc988b7282bcf153d977f57d16ed3c51b29d69693897f5783a95039f",
+                    "nonce" : "0xba7470a63985067e",
+                    "number" : "0x01",
+                    "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0x328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0573c3b20dc988b7282bcf153d977f57d16ed3c51b29d69693897f5783a95039f88ba7470a63985067ef865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4914bead859236088a0a8421c28859d2c1ff488dab2d44e228be62492b5adec8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182451341b8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a74337a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_5_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0xc3d8c024e3b38bb6f6315f7515421e58cd1d04a94ab75876de08233225002274",
+                    "mixHash" : "0x5d17668612cb1ea2e7f48972a4af541c4e1e3e3a32f58cec0bfcb91d2b3c78ae",
+                    "nonce" : "0x85e5088618b7279d",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
                     "receiptTrie" : "0xab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2b",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a09f3da210b4df0dbd4088a457f427346581f2b961e08887a308256ef4a97a5aef88c73fbedb2b3bb37df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a05d17668612cb1ea2e7f48972a4af541c4e1e3e3a32f58cec0bfcb91d2b3c78ae8885e5088618b7279df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd61cc960e725389fdf1401a54f40f2003b593ae8ed055a442ce23a6c396c3d44",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc3d8c024e3b38bb6f6315f7515421e58cd1d04a94ab75876de08233225002274",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_Frontier" : {
+    "CALLCODESha256_5_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/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f3f24",
-                    "hash" : "0xee59ffb9b454d99c3f6659f69c274e8f256c65f9d13f9b95bb9ec828aa765e0e",
-                    "mixHash" : "0xedfac31f292ff350e75115cec55c16c1ce5d99fe9bbbcbe18959b1d0881779ab",
-                    "nonce" : "0xdc9234c2790f9eef",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0xabb7ad5ccdb2e713fd48d7ab5f885503b86bb8b721744f9d54ef582983745ee9",
+                    "mixHash" : "0xaea26e73b9a5e6916df2e5d0e1feae19e87523d2dd8b4809222ad9c7a6bde57a",
+                    "nonce" : "0xac3c86523025be13",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
-                    "receiptTrie" : "0x3f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91d",
-                    "stateRoot" : "0x8f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95d",
+                    "receiptTrie" : "0xab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2b",
+                    "stateRoot" : "0xd9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a0edfac31f292ff350e75115cec55c16c1ce5d99fe9bbbcbe18959b1d0881779ab88dc9234c2790f9eeff865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0aea26e73b9a5e6916df2e5d0e1feae19e87523d2dd8b4809222ad9c7a6bde57a88ac3c86523025be13f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee59ffb9b454d99c3f6659f69c274e8f256c65f9d13f9b95bb9ec828aa765e0e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xabb7ad5ccdb2e713fd48d7ab5f885503b86bb8b721744f9d54ef582983745ee9",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245133f24",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7433a3c",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_Homestead" : {
+    "CALLCODESha256_5_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/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f3f24",
-                    "hash" : "0x895c996c2eb16914f3d4d182671a88115d3ebf41ed03cad3b2d6a5abbc6f3273",
-                    "mixHash" : "0x82b904120808ac0a826dd6efe66e9e0f871095bd77f2688f7a563e31e5015bc4",
-                    "nonce" : "0xdf7d678f32e567e0",
+                    "hash" : "0xeb236ffa4b63912f10264b3693a35d017f5b2859153381e55185b684f878482f",
+                    "mixHash" : "0xba871cabeedc85f75c81fd750b9238e8736d592f3b6e6671c9f9ff8e18ccd0a3",
+                    "nonce" : "0x54aed455d2be469b",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
                     "receiptTrie" : "0x3f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91d",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a082b904120808ac0a826dd6efe66e9e0f871095bd77f2688f7a563e31e5015bc488df7d678f32e567e0f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a0ba871cabeedc85f75c81fd750b9238e8736d592f3b6e6671c9f9ff8e18ccd0a38854aed455d2be469bf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x895c996c2eb16914f3d4d182671a88115d3ebf41ed03cad3b2d6a5abbc6f3273",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeb236ffa4b63912f10264b3693a35d017f5b2859153381e55185b684f878482f",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_Metropolis" : {
+    "CALLCODESha256_5_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/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f41b8",
-                    "hash" : "0x04e6819b6b476854c31c09e3f0b0c8fa0f79661b078baa21cf553495a6d9ea7a",
-                    "mixHash" : "0xb7b90be8f0ee0dc32442335b3c11695d60dd7afd14ddc3323bb4ab58bbe22cd6",
-                    "nonce" : "0xf2ee4a8f5cc858da",
+                    "gasUsed" : "0x1f3f24",
+                    "hash" : "0x702ad891be793270744fe6aacad88f378f3d510388c7b27325d0c3c33ad73ea9",
+                    "mixHash" : "0x78aba0e4dbb79e08a1e6caf247fc2a0aabca6d008a330d7e444823aeb9a6a2c8",
+                    "nonce" : "0x52946a5c6e59facd",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
-                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
-                    "stateRoot" : "0x328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4",
+                    "receiptTrie" : "0x3f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91d",
+                    "stateRoot" : "0x8f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0b7b90be8f0ee0dc32442335b3c11695d60dd7afd14ddc3323bb4ab58bbe22cd688f2ee4a8f5cc858daf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a078aba0e4dbb79e08a1e6caf247fc2a0aabca6d008a330d7e444823aeb9a6a2c88852946a5c6e59facdf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04e6819b6b476854c31c09e3f0b0c8fa0f79661b078baa21cf553495a6d9ea7a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x702ad891be793270744fe6aacad88f378f3d510388c7b27325d0c3c33ad73ea9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451341b8",
+                "balance" : "0x4563918245133f24",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a74337a8",
+                "balance" : "0x0de0b6b3a7433a3c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0.json
index 62c04d311..73b1d7733 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_0input_d0g0v0_EIP150" : {
+    "CallEcrecover0_0input_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/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01241b",
-                    "hash" : "0x41011fa3d098d805a1e2fbb6e9cd2ff72353c5f160c57e5f46b9add5a759a831",
-                    "mixHash" : "0x052ce1f4513026298e568cace6e39bc45970323470567cd7512f3aabcbcef9ae",
-                    "nonce" : "0xc3190849b10f4039",
+                    "gasUsed" : "0xc29b",
+                    "hash" : "0x3212ff5d0a8a31f67c73de787c2d93392ccdecc705ee31167d4c39439ae46283",
+                    "mixHash" : "0xc30857517ab4a955da13a153ebea55affce9d28f85a155dbf8be2b054d1f6b14",
+                    "nonce" : "0xdf53876acb308efe",
                     "number" : "0x01",
                     "parentHash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
-                    "receiptTrie" : "0x97db2323e3b1bd8c5328ee754155dd355f3e081d44d2726fe11d7c2f78498de2",
-                    "stateRoot" : "0x21ba2d5968e48f22d50f8f62f291a940ed8d5b3bf0a71ceed14c2332594409b8",
+                    "receiptTrie" : "0xe73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88",
+                    "stateRoot" : "0x92634fadc58ed9d5e659e84001fc439df42bf6e1267477030ea9c29241e3e85d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021ba2d5968e48f22d50f8f62f291a940ed8d5b3bf0a71ceed14c2332594409b8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a097db2323e3b1bd8c5328ee754155dd355f3e081d44d2726fe11d7c2f78498de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301241b8203e880a0052ce1f4513026298e568cace6e39bc45970323470567cd7512f3aabcbcef9ae88c3190849b10f4039f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092634fadc58ed9d5e659e84001fc439df42bf6e1267477030ea9c29241e3e85da0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a0c30857517ab4a955da13a153ebea55affce9d28f85a155dbf8be2b054d1f6b1488df53876acb308efef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41011fa3d098d805a1e2fbb6e9cd2ff72353c5f160c57e5f46b9add5a759a831",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3212ff5d0a8a31f67c73de787c2d93392ccdecc705ee31167d4c39439ae46283",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5241b",
+                "balance" : "0x4563918244f4c29b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615545",
+                "balance" : "0x0de0b6b3a761b6c5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallEcrecover0_0input_d0g0v0_EIP158" : {
+    "CallEcrecover0_0input_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/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc29b",
-                    "hash" : "0x4f1cbcc533aaa4c74b59ccaa49facf7e20cb4b4eae85fff7d004e8e51a4b2978",
-                    "mixHash" : "0xd5e989c1ac5e790250533030f16a1bfbfaad0b576bc91ba38a328d5b7b3f11a1",
-                    "nonce" : "0xac87f6f64b2ac42f",
+                    "hash" : "0x2002465dce451d9a40d7debb44abaa1fe12863366cac55c82a7a298f536bbc9a",
+                    "mixHash" : "0x11277a91f1adf4dffa597b624d17b8eb1e6fae6b061de3be76f7a0f211dca006",
+                    "nonce" : "0xc528d65a7cd1abf4",
                     "number" : "0x01",
                     "parentHash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
-                    "receiptTrie" : "0x72ceed9b1f4fe357f8a14d89fe2f4bc8b5edd598c968af9d23fb082d40b7c687",
-                    "stateRoot" : "0xf7240b9de1d9fb7aa12c85837773cf8a4d77419b19dbdd935faf1733174b4257",
+                    "receiptTrie" : "0xe73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88",
+                    "stateRoot" : "0x92634fadc58ed9d5e659e84001fc439df42bf6e1267477030ea9c29241e3e85d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7240b9de1d9fb7aa12c85837773cf8a4d77419b19dbdd935faf1733174b4257a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a072ceed9b1f4fe357f8a14d89fe2f4bc8b5edd598c968af9d23fb082d40b7c687b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a0d5e989c1ac5e790250533030f16a1bfbfaad0b576bc91ba38a328d5b7b3f11a188ac87f6f64b2ac42ff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092634fadc58ed9d5e659e84001fc439df42bf6e1267477030ea9c29241e3e85da0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a011277a91f1adf4dffa597b624d17b8eb1e6fae6b061de3be76f7a0f211dca00688c528d65a7cd1abf4f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f1cbcc533aaa4c74b59ccaa49facf7e20cb4b4eae85fff7d004e8e51a4b2978",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2002465dce451d9a40d7debb44abaa1fe12863366cac55c82a7a298f536bbc9a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallEcrecover0_0input_d0g0v0_Frontier" : {
+    "CallEcrecover0_0input_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/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x012187",
-                    "hash" : "0x5afe79e6e1223eb9d2b31ea33ab8bee5bee4d8e75c4d2709a74f744cc5156aec",
-                    "mixHash" : "0xffee77b65715d0abe8c14d874aea41f52d87c7229fbec08afa07eeffa91eb047",
-                    "nonce" : "0xe357e86e2e583758",
+                    "gasUsed" : "0x01241b",
+                    "hash" : "0x6ece5c6dd4e766f4b9443d9447d2ff170fdaa1a38055674ce3c1199c8715a194",
+                    "mixHash" : "0x51dd35e2aafff7d95bad33b969c339a00c59beb99bfdb1d0311612c9f1dba596",
+                    "nonce" : "0x5f4745d8e0063c61",
                     "number" : "0x01",
                     "parentHash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
-                    "receiptTrie" : "0x04a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5",
-                    "stateRoot" : "0xc8b47d43fcc24bf0b01fc5e7b737b0e70151f0219e0ea50e4856384bdc2f1771",
+                    "receiptTrie" : "0x97db2323e3b1bd8c5328ee754155dd355f3e081d44d2726fe11d7c2f78498de2",
+                    "stateRoot" : "0x21ba2d5968e48f22d50f8f62f291a940ed8d5b3bf0a71ceed14c2332594409b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8b47d43fcc24bf0b01fc5e7b737b0e70151f0219e0ea50e4856384bdc2f1771a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a004a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830121878203e880a0ffee77b65715d0abe8c14d874aea41f52d87c7229fbec08afa07eeffa91eb04788e357e86e2e583758f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021ba2d5968e48f22d50f8f62f291a940ed8d5b3bf0a71ceed14c2332594409b8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a097db2323e3b1bd8c5328ee754155dd355f3e081d44d2726fe11d7c2f78498de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301241b8203e880a051dd35e2aafff7d95bad33b969c339a00c59beb99bfdb1d0311612c9f1dba596885f4745d8e0063c61f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5afe79e6e1223eb9d2b31ea33ab8bee5bee4d8e75c4d2709a74f744cc5156aec",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6ece5c6dd4e766f4b9443d9447d2ff170fdaa1a38055674ce3c1199c8715a194",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52187",
+                "balance" : "0x4563918244f5241b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76157d9",
+                "balance" : "0x0de0b6b3a7615545",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallEcrecover0_0input_d0g0v0_Homestead" : {
+    "CallEcrecover0_0input_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/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc29b",
+                    "hash" : "0x60afbb70711fce57c84fa31cd8da142bb302b55c83f36b2c36a6da197d16a72a",
+                    "mixHash" : "0x02796d7c57bb8f9b8e81ca2d1c22a475fa8add3d80c1937d74cd80fb51a5f7d3",
+                    "nonce" : "0x10f4aff9cf1d65e6",
+                    "number" : "0x01",
+                    "parentHash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
+                    "receiptTrie" : "0x72ceed9b1f4fe357f8a14d89fe2f4bc8b5edd598c968af9d23fb082d40b7c687",
+                    "stateRoot" : "0xf7240b9de1d9fb7aa12c85837773cf8a4d77419b19dbdd935faf1733174b4257",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7240b9de1d9fb7aa12c85837773cf8a4d77419b19dbdd935faf1733174b4257a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a072ceed9b1f4fe357f8a14d89fe2f4bc8b5edd598c968af9d23fb082d40b7c687b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a002796d7c57bb8f9b8e81ca2d1c22a475fa8add3d80c1937d74cd80fb51a5f7d38810f4aff9cf1d65e6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x60afbb70711fce57c84fa31cd8da142bb302b55c83f36b2c36a6da197d16a72a",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c29b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761b6c5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_0input_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012187",
-                    "hash" : "0x2b9f6704084b2d72e2cae380777ebadcf29739293191a97ff2caa927d5c4e560",
-                    "mixHash" : "0x61d6376f17695fc5d3ebda3dea0f9caa4d433d04c2443b95d80b1f86f4dded2b",
-                    "nonce" : "0xee31ae87dfc34dde",
+                    "hash" : "0xce65a1cf90819acdc5687fd4598d14dd7da95f06d241cc15aa3f7c077b7a62ae",
+                    "mixHash" : "0xb0535309f47bc71b96e2242dc02635246202d3794bffbff0fd21f8b3869e83aa",
+                    "nonce" : "0xee08a287fe63f84c",
                     "number" : "0x01",
                     "parentHash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
                     "receiptTrie" : "0x04a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8b47d43fcc24bf0b01fc5e7b737b0e70151f0219e0ea50e4856384bdc2f1771a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a004a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830121878203e880a061d6376f17695fc5d3ebda3dea0f9caa4d433d04c2443b95d80b1f86f4dded2b88ee31ae87dfc34ddef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8b47d43fcc24bf0b01fc5e7b737b0e70151f0219e0ea50e4856384bdc2f1771a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a004a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830121878203e880a0b0535309f47bc71b96e2242dc02635246202d3794bffbff0fd21f8b3869e83aa88ee08a287fe63f84cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b9f6704084b2d72e2cae380777ebadcf29739293191a97ff2caa927d5c4e560",
-        "network" : "Homestead",
+        "lastblockhash" : "0xce65a1cf90819acdc5687fd4598d14dd7da95f06d241cc15aa3f7c077b7a62ae",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallEcrecover0_0input_d0g0v0_Metropolis" : {
+    "CallEcrecover0_0input_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/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc29b",
-                    "hash" : "0xd7ff5ec960f05af7394803eacc915adaccd05372f98dc06e2f5013ba32f9b6ec",
-                    "mixHash" : "0xd566fb070211b548fcd69fbe77687f509d7b49f0c83fce448b2c6ab1d27beeb8",
-                    "nonce" : "0x69637048cf74a7dd",
+                    "gasUsed" : "0x012187",
+                    "hash" : "0xf5aea06e40bf1345997165d63be05df531e3746768aca0d40ecbfb4f4cc686c5",
+                    "mixHash" : "0xbaeda72d10436966270132756261991786980705db2bba2ec31ba6f4905f17eb",
+                    "nonce" : "0x6db5f6cdf79ecc94",
                     "number" : "0x01",
                     "parentHash" : "0xe80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8d",
-                    "receiptTrie" : "0xe73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88",
-                    "stateRoot" : "0x92634fadc58ed9d5e659e84001fc439df42bf6e1267477030ea9c29241e3e85d",
+                    "receiptTrie" : "0x04a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5",
+                    "stateRoot" : "0xc8b47d43fcc24bf0b01fc5e7b737b0e70151f0219e0ea50e4856384bdc2f1771",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092634fadc58ed9d5e659e84001fc439df42bf6e1267477030ea9c29241e3e85da0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0e73632742448b17cfe308398b2f080f534b7315cf20171adb78d375ec3fb7f88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c29b8203e880a0d566fb070211b548fcd69fbe77687f509d7b49f0c83fce448b2c6ab1d27beeb88869637048cf74a7ddf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0e80f54e6ff4d2107a808a69feac854196456c6a8bebb7dc0eb7de480085d0b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8b47d43fcc24bf0b01fc5e7b737b0e70151f0219e0ea50e4856384bdc2f1771a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a004a67723168be125a0c8f38c88dd24fbdd657ef4520b1f5263fb944c1c5ff7d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830121878203e880a0baeda72d10436966270132756261991786980705db2bba2ec31ba6f4905f17eb886db5f6cdf79ecc94f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e97428e1947d58ed55fba1709966404d18cab6b532a7628e92a0e65745130aa0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7ff5ec960f05af7394803eacc915adaccd05372f98dc06e2f5013ba32f9b6ec",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf5aea06e40bf1345997165d63be05df531e3746768aca0d40ecbfb4f4cc686c5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c29b",
+                "balance" : "0x4563918244f52187",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b6c5",
+                "balance" : "0x0de0b6b3a76157d9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0.json
index 4c5472b7f..a906919b4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_Gas2999_d0g0v0_EIP150" : {
+    "CallEcrecover0_Gas2999_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/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfe01",
-                    "hash" : "0x75f3d5fb076011cd5bbb5d0e8fd6431df114431b80fca62ce802f53ce34b3857",
-                    "mixHash" : "0x13228c7d7d2f38d9b26009c820a3616404d0756d252285e713aa3e0c904c26cf",
-                    "nonce" : "0x745d8db53e1b632b",
+                    "gasUsed" : "0x9c81",
+                    "hash" : "0x130e68d0e61cc5481d0b2a7caccc4825fa9ae57fc5ca5743488c50be083ca76c",
+                    "mixHash" : "0xe67ce7271652a5eb48274f422219dbde73a08e0ab2769dd670dad638417cefd9",
+                    "nonce" : "0xafa447e60b544622",
                     "number" : "0x01",
                     "parentHash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
-                    "receiptTrie" : "0x8a3d45d555dabc6d23fae49e387b7d389b2f68fea7ed3d914ebce7f4083436f9",
-                    "stateRoot" : "0x4a751081e3046a409a04a707defbb7471fded81b8a305e025058c72e22d6f82b",
+                    "receiptTrie" : "0x337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adf",
+                    "stateRoot" : "0x3deb0f93944ed484084f884f0ff5cda30c633f7927e77069a8dc7163b8a1aa6b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a751081e3046a409a04a707defbb7471fded81b8a305e025058c72e22d6f82ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08a3d45d555dabc6d23fae49e387b7d389b2f68fea7ed3d914ebce7f4083436f9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fe018203e880a013228c7d7d2f38d9b26009c820a3616404d0756d252285e713aa3e0c904c26cf88745d8db53e1b632bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03deb0f93944ed484084f884f0ff5cda30c633f7927e77069a8dc7163b8a1aa6ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0e67ce7271652a5eb48274f422219dbde73a08e0ab2769dd670dad638417cefd988afa447e60b544622f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75f3d5fb076011cd5bbb5d0e8fd6431df114431b80fca62ce802f53ce34b3857",
-        "network" : "EIP150",
+        "lastblockhash" : "0x130e68d0e61cc5481d0b2a7caccc4825fa9ae57fc5ca5743488c50be083ca76c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fe01",
+                "balance" : "0x4563918244f49c81",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617b5f",
+                "balance" : "0x0de0b6b3a761dcdf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "CallEcrecover0_Gas2999_d0g0v0_EIP158" : {
+    "CallEcrecover0_Gas2999_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/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x9c81",
-                    "hash" : "0xd3e4810f4bcc05be27d94a3a96d0235a72ffe9ca798f70b0e602a1e31da04984",
-                    "mixHash" : "0xa75d4cf466d815e8461ddedf69270a100fae4bef67a4148cb1a4f8aed9ffac2e",
-                    "nonce" : "0x7a9b9a58a24d89ae",
+                    "hash" : "0x560bf1461c3f1f69d7d550e544c795f9f78021080d62d9d74fa1c0c6b60ac665",
+                    "mixHash" : "0x5b127923c7a9236f25cf1e1b3456ad12fbf27376a5afadb204b1fed0cd1d52b6",
+                    "nonce" : "0xf53a4f11cdced927",
                     "number" : "0x01",
                     "parentHash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
-                    "receiptTrie" : "0x824a4b19937aee24aad96599a74f956aecef948d7aa427758d83429b5cd0e738",
-                    "stateRoot" : "0xd74de1e1538eba220f46aada0af3c94b7f86ca6470e5297afe353a5f0a0655f9",
+                    "receiptTrie" : "0x337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adf",
+                    "stateRoot" : "0x3deb0f93944ed484084f884f0ff5cda30c633f7927e77069a8dc7163b8a1aa6b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d74de1e1538eba220f46aada0af3c94b7f86ca6470e5297afe353a5f0a0655f9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0824a4b19937aee24aad96599a74f956aecef948d7aa427758d83429b5cd0e738b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0a75d4cf466d815e8461ddedf69270a100fae4bef67a4148cb1a4f8aed9ffac2e887a9b9a58a24d89aef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03deb0f93944ed484084f884f0ff5cda30c633f7927e77069a8dc7163b8a1aa6ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a05b127923c7a9236f25cf1e1b3456ad12fbf27376a5afadb204b1fed0cd1d52b688f53a4f11cdced927f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3e4810f4bcc05be27d94a3a96d0235a72ffe9ca798f70b0e602a1e31da04984",
-        "network" : "EIP158",
+        "lastblockhash" : "0x560bf1461c3f1f69d7d550e544c795f9f78021080d62d9d74fa1c0c6b60ac665",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "CallEcrecover0_Gas2999_d0g0v0_Frontier" : {
+    "CallEcrecover0_Gas2999_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/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +237,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfad7",
-                    "hash" : "0x7e24211c691fc6ad2e23b567fa877062f9c8556a846778a159c286f0093fb05e",
-                    "mixHash" : "0xd2a08b9caab7355b5b3c8b7abad6f35ae752f46b43926ad94f06f3efe9539cd4",
-                    "nonce" : "0x39d13861f35c074e",
+                    "gasUsed" : "0xfe01",
+                    "hash" : "0x46254a1501421eb4599361b2db8b309517871bacd29bb9ebd28c3ae82996499a",
+                    "mixHash" : "0xb3f1816064e9dd3a434638f2b081307e5b41289a98f2a6e4925bdb39947fad67",
+                    "nonce" : "0xce0fce1a7fe9feee",
                     "number" : "0x01",
                     "parentHash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
-                    "receiptTrie" : "0xe36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464",
-                    "stateRoot" : "0xf73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482",
+                    "receiptTrie" : "0x8a3d45d555dabc6d23fae49e387b7d389b2f68fea7ed3d914ebce7f4083436f9",
+                    "stateRoot" : "0x4a751081e3046a409a04a707defbb7471fded81b8a305e025058c72e22d6f82b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fad78203e880a0d2a08b9caab7355b5b3c8b7abad6f35ae752f46b43926ad94f06f3efe9539cd48839d13861f35c074ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a751081e3046a409a04a707defbb7471fded81b8a305e025058c72e22d6f82ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08a3d45d555dabc6d23fae49e387b7d389b2f68fea7ed3d914ebce7f4083436f9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fe018203e880a0b3f1816064e9dd3a434638f2b081307e5b41289a98f2a6e4925bdb39947fad6788ce0fce1a7fe9feeef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e24211c691fc6ad2e23b567fa877062f9c8556a846778a159c286f0093fb05e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x46254a1501421eb4599361b2db8b309517871bacd29bb9ebd28c3ae82996499a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -283,14 +297,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fad7",
+                "balance" : "0x4563918244f4fe01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617e89",
+                "balance" : "0x0de0b6b3a7617b5f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +328,10 @@
             }
         }
     },
-    "CallEcrecover0_Gas2999_d0g0v0_Homestead" : {
+    "CallEcrecover0_Gas2999_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/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -328,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfad7",
-                    "hash" : "0xc46169fff412eb911930ff343089c2ae289e5e065367004aa138fc229f805752",
-                    "mixHash" : "0xdf57ed22c2694137275ca406e03a6a67936f56248ee82d41b0d8fa3aaf8c4da3",
-                    "nonce" : "0x4305782c43e7045b",
+                    "gasUsed" : "0x9c81",
+                    "hash" : "0x7f723a9365cb1dd1d4ed6c55da8403b11203cb365fc52e23782a8d3903beaeda",
+                    "mixHash" : "0xf80dc8240714a5dddc852e882fb37af4712ab4226cca0ac43c83276a0ae1e8d7",
+                    "nonce" : "0x41d0aeb7e73b1365",
                     "number" : "0x01",
                     "parentHash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
-                    "receiptTrie" : "0xe36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464",
-                    "stateRoot" : "0xf73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482",
+                    "receiptTrie" : "0x824a4b19937aee24aad96599a74f956aecef948d7aa427758d83429b5cd0e738",
+                    "stateRoot" : "0xd74de1e1538eba220f46aada0af3c94b7f86ca6470e5297afe353a5f0a0655f9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fad78203e880a0df57ed22c2694137275ca406e03a6a67936f56248ee82d41b0d8fa3aaf8c4da3884305782c43e7045bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d74de1e1538eba220f46aada0af3c94b7f86ca6470e5297afe353a5f0a0655f9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0824a4b19937aee24aad96599a74f956aecef948d7aa427758d83429b5cd0e738b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0f80dc8240714a5dddc852e882fb37af4712ab4226cca0ac43c83276a0ae1e8d78841d0aeb7e73b1365f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc46169fff412eb911930ff343089c2ae289e5e065367004aa138fc229f805752",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7f723a9365cb1dd1d4ed6c55da8403b11203cb365fc52e23782a8d3903beaeda",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -388,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fad7",
+                "balance" : "0x4563918244f49c81",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617e89",
+                "balance" : "0x0de0b6b3a761dcdf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +433,10 @@
             }
         }
     },
-    "CallEcrecover0_Gas2999_d0g0v0_Metropolis" : {
+    "CallEcrecover0_Gas2999_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/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x9c81",
-                    "hash" : "0x33839850917c58d413f0ce8dd528392a05a5ea5791d8606bacac65b41423b933",
-                    "mixHash" : "0x232f0d1d3cef0bbc605f6d3a836fe5a4649f0ce97b629804b853fe586ef46fe2",
-                    "nonce" : "0xa02fd896e3ce954e",
+                    "gasUsed" : "0xfad7",
+                    "hash" : "0x0d37d595786663bdb1d8ecfcd945084f7d3c41fe12298f48c040e6afaa344488",
+                    "mixHash" : "0x24951581b5c830ce753a128463aa66f7cf628959267dd0d527645d0434252d0a",
+                    "nonce" : "0x4686fb01cc618039",
                     "number" : "0x01",
                     "parentHash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
-                    "receiptTrie" : "0x337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adf",
-                    "stateRoot" : "0x3deb0f93944ed484084f884f0ff5cda30c633f7927e77069a8dc7163b8a1aa6b",
+                    "receiptTrie" : "0xe36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464",
+                    "stateRoot" : "0xf73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03deb0f93944ed484084f884f0ff5cda30c633f7927e77069a8dc7163b8a1aa6ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0337ef5be00534e11f2046731d964073085cc39cce1e77f1d7fd5ac2c2eb91adfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c818203e880a0232f0d1d3cef0bbc605f6d3a836fe5a4649f0ce97b629804b853fe586ef46fe288a02fd896e3ce954ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fad78203e880a024951581b5c830ce753a128463aa66f7cf628959267dd0d527645d0434252d0a884686fb01cc618039f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33839850917c58d413f0ce8dd528392a05a5ea5791d8606bacac65b41423b933",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0d37d595786663bdb1d8ecfcd945084f7d3c41fe12298f48c040e6afaa344488",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4fad7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7617e89",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_Gas2999_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xfad7",
+                    "hash" : "0x67282d68171948cddefc8d935b130c3e3cb6036310180a608a371b91b622606f",
+                    "mixHash" : "0x255fd4895e09c69a9926e5782cd16af03328fb4307eb17954d224b4f0211f6c6",
+                    "nonce" : "0x7b16b60270f1dfea",
+                    "number" : "0x01",
+                    "parentHash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
+                    "receiptTrie" : "0xe36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464",
+                    "stateRoot" : "0xf73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0bc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f73b5c5d50085e682f42eeefa136e92c92b4069e5256901f6db2bd22c7650482a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e36795a51cf97a96acbb965d1a624cd8fdba51cb546dff605a9e749d94f56464b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fad78203e880a0255fd4895e09c69a9926e5782cd16af03328fb4307eb17954d224b4f0211f6c6887b16b60270f1dfeaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbc6b57cf17729be68d25355969c12b82dc92f573a43acafc1e51f757f0e63cd9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6f876091e30b65ae51f189ffa7f1ceacec9dbf4bd8d38a017dc285dc1c75b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67282d68171948cddefc8d935b130c3e3cb6036310180a608a371b91b622606f",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155",
@@ -500,14 +612,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49c81",
+                "balance" : "0x4563918244f4fad7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761dcdf",
+                "balance" : "0x0de0b6b3a7617e89",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0.json
index 74acb6073..385ae7d28 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_NoGas_d0g0v0_EIP150" : {
+    "CallEcrecover0_NoGas_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/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011572",
-                    "hash" : "0xeb1a47597b57c08e0c531b1cf99c125a9a3de335fc9e1ab4cb06bb8c3163adf4",
-                    "mixHash" : "0x30596ad4b38b6da33d67597518ed104b24e87e6168b88f2326884aeb1e1a70cc",
-                    "nonce" : "0x185fb951fb732122",
+                    "gasUsed" : "0x01159a",
+                    "hash" : "0x300255868d4e0a5a7a50aff7c822a2c4760ca2a8a2ea5b359027a8d488eca103",
+                    "mixHash" : "0x8b68ee1458aafb7814fa04215111212fcbf265524e476f8daeead616fd4e5aea",
+                    "nonce" : "0x869a993cf3869700",
                     "number" : "0x01",
                     "parentHash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
-                    "receiptTrie" : "0x1d49802cd5b7c014a6ee8df3aef6fee32f479213f021df8ad37c881c1ca013f1",
-                    "stateRoot" : "0x5e832f13fa1bfce17f199e4aa83c9312b6dee4184000d34dc1e2f9b8c09e27a2",
+                    "receiptTrie" : "0x87aa974971010eeff16a2e0321610adffc6ba42bbf8a95d9bef5abba1f16af8b",
+                    "stateRoot" : "0xdc6e98070732796ee8b867a5879f1c78058b5b3f7d82dfc50a3346b07dd79ac6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e832f13fa1bfce17f199e4aa83c9312b6dee4184000d34dc1e2f9b8c09e27a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d49802cd5b7c014a6ee8df3aef6fee32f479213f021df8ad37c881c1ca013f1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115728203e880a030596ad4b38b6da33d67597518ed104b24e87e6168b88f2326884aeb1e1a70cc88185fb951fb732122f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6e98070732796ee8b867a5879f1c78058b5b3f7d82dfc50a3346b07dd79ac6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba087aa974971010eeff16a2e0321610adffc6ba42bbf8a95d9bef5abba1f16af8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301159a8203e880a08b68ee1458aafb7814fa04215111212fcbf265524e476f8daeead616fd4e5aea88869a993cf3869700f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb1a47597b57c08e0c531b1cf99c125a9a3de335fc9e1ab4cb06bb8c3163adf4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x300255868d4e0a5a7a50aff7c822a2c4760ca2a8a2ea5b359027a8d488eca103",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51572",
+                "balance" : "0x4563918244f5159a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76163ee",
+                "balance" : "0x0de0b6b3a76163c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "CallEcrecover0_NoGas_d0g0v0_EIP158" : {
+    "CallEcrecover0_NoGas_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/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01159a",
-                    "hash" : "0x4748b547675c80ca36fe4b981ad2f47335fcec06227d7547191024fda7567655",
-                    "mixHash" : "0x9ca723722607310496360db3ff24a9d5a6672455070d84d217c90f693b6cd4dc",
-                    "nonce" : "0x945542bf9ba19232",
+                    "hash" : "0xfeb338ca630b7f278165689f496d3201e423bc21dd3f56e14024bfe58a7c96f1",
+                    "mixHash" : "0xc90d99bed7b94866456caaa15101f779c161225813e69eedf9d8d8d36614361d",
+                    "nonce" : "0xcc0befb2f282b928",
                     "number" : "0x01",
                     "parentHash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
-                    "receiptTrie" : "0x35b2c7c62d533cbec41842472a9c4011eb6b4d813136e321e3d42a224abc106c",
-                    "stateRoot" : "0x4c4de8a91af1021f35b8beae60d589037bb5160dfffaf50569a84aef9928c241",
+                    "receiptTrie" : "0x87aa974971010eeff16a2e0321610adffc6ba42bbf8a95d9bef5abba1f16af8b",
+                    "stateRoot" : "0xdc6e98070732796ee8b867a5879f1c78058b5b3f7d82dfc50a3346b07dd79ac6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c4de8a91af1021f35b8beae60d589037bb5160dfffaf50569a84aef9928c241a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba035b2c7c62d533cbec41842472a9c4011eb6b4d813136e321e3d42a224abc106cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301159a8203e880a09ca723722607310496360db3ff24a9d5a6672455070d84d217c90f693b6cd4dc88945542bf9ba19232f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6e98070732796ee8b867a5879f1c78058b5b3f7d82dfc50a3346b07dd79ac6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba087aa974971010eeff16a2e0321610adffc6ba42bbf8a95d9bef5abba1f16af8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301159a8203e880a0c90d99bed7b94866456caaa15101f779c161225813e69eedf9d8d8d36614361d88cc0befb2f282b928f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4748b547675c80ca36fe4b981ad2f47335fcec06227d7547191024fda7567655",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfeb338ca630b7f278165689f496d3201e423bc21dd3f56e14024bfe58a7c96f1",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "CallEcrecover0_NoGas_d0g0v0_Frontier" : {
+    "CallEcrecover0_NoGas_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/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +237,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011248",
-                    "hash" : "0x7d7624a7ca09a6f699dbc65547bbf5c19e3885a19c1edd48007a0595b6432d6d",
-                    "mixHash" : "0x400d510eb989bbfeb43941a4bae2901fabb483c3baff126b5d5728a3bac88df1",
-                    "nonce" : "0xe95d2e79feea1ac5",
+                    "gasUsed" : "0x011572",
+                    "hash" : "0x623fb7684f81b725096826333b6313428b5ce6b907083a64b21e125d30a11df1",
+                    "mixHash" : "0x8f28046051a8da73050cdd56b98a907d28e39a26862a92ca5551f034cff14f11",
+                    "nonce" : "0xcf6bbbc653303f5f",
                     "number" : "0x01",
                     "parentHash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
-                    "receiptTrie" : "0x06c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25",
-                    "stateRoot" : "0xcf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5e",
+                    "receiptTrie" : "0x1d49802cd5b7c014a6ee8df3aef6fee32f479213f021df8ad37c881c1ca013f1",
+                    "stateRoot" : "0x5e832f13fa1bfce17f199e4aa83c9312b6dee4184000d34dc1e2f9b8c09e27a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba006c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830112488203e880a0400d510eb989bbfeb43941a4bae2901fabb483c3baff126b5d5728a3bac88df188e95d2e79feea1ac5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e832f13fa1bfce17f199e4aa83c9312b6dee4184000d34dc1e2f9b8c09e27a2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d49802cd5b7c014a6ee8df3aef6fee32f479213f021df8ad37c881c1ca013f1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115728203e880a08f28046051a8da73050cdd56b98a907d28e39a26862a92ca5551f034cff14f1188cf6bbbc653303f5ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d7624a7ca09a6f699dbc65547bbf5c19e3885a19c1edd48007a0595b6432d6d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x623fb7684f81b725096826333b6313428b5ce6b907083a64b21e125d30a11df1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -283,14 +297,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51248",
+                "balance" : "0x4563918244f51572",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616718",
+                "balance" : "0x0de0b6b3a76163ee",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +328,10 @@
             }
         }
     },
-    "CallEcrecover0_NoGas_d0g0v0_Homestead" : {
+    "CallEcrecover0_NoGas_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/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -328,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011248",
-                    "hash" : "0x6ce0525f6ac183cf4fb3e1ec3a797986badb76f9fdf2c7c84aed7f4425f18d7b",
-                    "mixHash" : "0xc139adc767718656f5d33ae89df449c1747c328f095567a93a282979d5352e33",
-                    "nonce" : "0xdc7c2edb623c9943",
+                    "gasUsed" : "0x01159a",
+                    "hash" : "0x0ed47eee7bb525c4c8064d4fc3825a23f619470242a581e5f9ed3dccef7850bc",
+                    "mixHash" : "0x60e9b3a86f9dfe17d5d6ecec09ac6828b2c8ec24218f4576f980f1772e33706b",
+                    "nonce" : "0x1e7b20338ac3a623",
                     "number" : "0x01",
                     "parentHash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
-                    "receiptTrie" : "0x06c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25",
-                    "stateRoot" : "0xcf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5e",
+                    "receiptTrie" : "0x35b2c7c62d533cbec41842472a9c4011eb6b4d813136e321e3d42a224abc106c",
+                    "stateRoot" : "0x4c4de8a91af1021f35b8beae60d589037bb5160dfffaf50569a84aef9928c241",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba006c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830112488203e880a0c139adc767718656f5d33ae89df449c1747c328f095567a93a282979d5352e3388dc7c2edb623c9943f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c4de8a91af1021f35b8beae60d589037bb5160dfffaf50569a84aef9928c241a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba035b2c7c62d533cbec41842472a9c4011eb6b4d813136e321e3d42a224abc106cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301159a8203e880a060e9b3a86f9dfe17d5d6ecec09ac6828b2c8ec24218f4576f980f1772e33706b881e7b20338ac3a623f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ce0525f6ac183cf4fb3e1ec3a797986badb76f9fdf2c7c84aed7f4425f18d7b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0ed47eee7bb525c4c8064d4fc3825a23f619470242a581e5f9ed3dccef7850bc",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -388,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51248",
+                "balance" : "0x4563918244f5159a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616718",
+                "balance" : "0x0de0b6b3a76163c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +433,10 @@
             }
         }
     },
-    "CallEcrecover0_NoGas_d0g0v0_Metropolis" : {
+    "CallEcrecover0_NoGas_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/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01159a",
-                    "hash" : "0xd18eea7c95bbd395af874a8c4db17e69e3a2736b3e358a7479c0811e4afe4844",
-                    "mixHash" : "0xe46c7ce96e3de249a78af475b177297bcce14f7d1520e8d234aba5932d94b8dc",
-                    "nonce" : "0x64c6876e48c3bc72",
+                    "gasUsed" : "0x011248",
+                    "hash" : "0x088549d050259027bc2aa61e810ce364b2eded644f79eeecf2283e0a8187ac48",
+                    "mixHash" : "0x42155e4126c26bf64b7568c9a05ba2308c90a4d635d1e7e028196f343d47c4c8",
+                    "nonce" : "0xdcd7eb929273ba71",
                     "number" : "0x01",
                     "parentHash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
-                    "receiptTrie" : "0x87aa974971010eeff16a2e0321610adffc6ba42bbf8a95d9bef5abba1f16af8b",
-                    "stateRoot" : "0xdc6e98070732796ee8b867a5879f1c78058b5b3f7d82dfc50a3346b07dd79ac6",
+                    "receiptTrie" : "0x06c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25",
+                    "stateRoot" : "0xcf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6e98070732796ee8b867a5879f1c78058b5b3f7d82dfc50a3346b07dd79ac6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba087aa974971010eeff16a2e0321610adffc6ba42bbf8a95d9bef5abba1f16af8bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301159a8203e880a0e46c7ce96e3de249a78af475b177297bcce14f7d1520e8d234aba5932d94b8dc8864c6876e48c3bc72f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba006c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830112488203e880a042155e4126c26bf64b7568c9a05ba2308c90a4d635d1e7e028196f343d47c4c888dcd7eb929273ba71f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd18eea7c95bbd395af874a8c4db17e69e3a2736b3e358a7479c0811e4afe4844",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x088549d050259027bc2aa61e810ce364b2eded644f79eeecf2283e0a8187ac48",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51248",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616718",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_NoGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011248",
+                    "hash" : "0x4a318391487d0fd41897136ff4e7e93ac2fbd277b6aa60d1cec193a8fcf29883",
+                    "mixHash" : "0x3d5969d43b437205c19a81dedc0b36c89aa3ae5f663f42aaef4157daab089e33",
+                    "nonce" : "0xf6ee0bdf01a7a6c0",
+                    "number" : "0x01",
+                    "parentHash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
+                    "receiptTrie" : "0x06c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25",
+                    "stateRoot" : "0xcf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0bbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf76cbc6a55bea00bad8cb6df77c83da9c095e1166098ab25abb823dac6c0b5ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba006c8961eb3e23ba1f8031fba7f5ea431c92e789f81e89586563f6ee1a2594d25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830112488203e880a03d5969d43b437205c19a81dedc0b36c89aa3ae5f663f42aaef4157daab089e3388f6ee0bdf01a7a6c0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbbb6b9efc0ae70153b36a893bf0b93562f0ebdff43dc97f1f331dcb495f96979",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec1c5f80a88e62c21fbd85da8485b8d90ebd83129f8dacba7a8aab1b743c8ac9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4a318391487d0fd41897136ff4e7e93ac2fbd277b6aa60d1cec193a8fcf29883",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155",
@@ -500,14 +612,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5159a",
+                "balance" : "0x4563918244f51248",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76163c6",
+                "balance" : "0x0de0b6b3a7616718",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0.json
index 78fe01a60..329b5655d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_completeReturnValue_d0g0v0_EIP150" : {
+    "CallEcrecover0_completeReturnValue_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/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015eb8",
-                    "hash" : "0x5a223b03fe1a905ae68168c4b9359cd6dbc8a50b3643c73f3619450297fe1604",
-                    "mixHash" : "0xb22d9f41a38c34afbca8aeac96e214552125f72dde99fe7bd5292e2dab39bf8c",
-                    "nonce" : "0x6c5f0ce7400667a0",
+                    "gasUsed" : "0xfd10",
+                    "hash" : "0x76ac662531cccf0446f64de24938824c7bf9c68211f15f4b56e684328012364d",
+                    "mixHash" : "0x7872fca528b299e5264a295b23a4e32b9fd2683063beeec77340222a3775f5a7",
+                    "nonce" : "0x976d7eb616dbc9c1",
                     "number" : "0x01",
                     "parentHash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
-                    "receiptTrie" : "0x1502eb0ee73f230804475a4605ae8fd8f4e71b2d8362e668b4cc1385215302f0",
-                    "stateRoot" : "0xd8f85eb1d5a6169e675b8588a800962dbdfeb319f3fe1216f0b3235045945cac",
+                    "receiptTrie" : "0xe764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7",
+                    "stateRoot" : "0x4df0ef6972199e9df036f946ca530df8c4ff17b942ecba38a63ab9e4b4327fb7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8f85eb1d5a6169e675b8588a800962dbdfeb319f3fe1216f0b3235045945caca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01502eb0ee73f230804475a4605ae8fd8f4e71b2d8362e668b4cc1385215302f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015eb88203e880a0b22d9f41a38c34afbca8aeac96e214552125f72dde99fe7bd5292e2dab39bf8c886c5f0ce7400667a0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04df0ef6972199e9df036f946ca530df8c4ff17b942ecba38a63ab9e4b4327fb7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a07872fca528b299e5264a295b23a4e32b9fd2683063beeec77340222a3775f5a788976d7eb616dbc9c1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a223b03fe1a905ae68168c4b9359cd6dbc8a50b3643c73f3619450297fe1604",
-        "network" : "EIP150",
+        "lastblockhash" : "0x76ac662531cccf0446f64de24938824c7bf9c68211f15f4b56e684328012364d",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55eb8",
+                "balance" : "0x4563918244f4fd10",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7611aa8",
+                "balance" : "0x0de0b6b3a7617c50",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallEcrecover0_completeReturnValue_d0g0v0_EIP158" : {
+    "CallEcrecover0_completeReturnValue_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/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xfd10",
-                    "hash" : "0x903a85216e9afe562e7bb0d7fbd858548b2b0c53c307699190e562016ff1b697",
-                    "mixHash" : "0x28a0ac6beb0f2784e6fefa62d7a47a7165e3cf3e5a8de3a36b2309bd98dec182",
-                    "nonce" : "0x36e402c596a439e6",
+                    "hash" : "0x7c1e2e3c49cce288d37f57d3b2c28e23ce5292465f1109c2739213cee7a582e9",
+                    "mixHash" : "0x65296dc26392fd895c3a6ca0a607f92f792837478829a264faef2c5eee1352f9",
+                    "nonce" : "0xb9b44f2428548f7f",
                     "number" : "0x01",
                     "parentHash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
-                    "receiptTrie" : "0x8b1567329f4a308e6004d13a98db59258fd4ea2d4343da84b3482a1f3821b963",
-                    "stateRoot" : "0x8000e6890444dd8f128ea4f890bde73847f16ba73cfec32a145a51355949bd2a",
+                    "receiptTrie" : "0xe764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7",
+                    "stateRoot" : "0x4df0ef6972199e9df036f946ca530df8c4ff17b942ecba38a63ab9e4b4327fb7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08000e6890444dd8f128ea4f890bde73847f16ba73cfec32a145a51355949bd2aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08b1567329f4a308e6004d13a98db59258fd4ea2d4343da84b3482a1f3821b963b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a028a0ac6beb0f2784e6fefa62d7a47a7165e3cf3e5a8de3a36b2309bd98dec1828836e402c596a439e6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04df0ef6972199e9df036f946ca530df8c4ff17b942ecba38a63ab9e4b4327fb7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a065296dc26392fd895c3a6ca0a607f92f792837478829a264faef2c5eee1352f988b9b44f2428548f7ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x903a85216e9afe562e7bb0d7fbd858548b2b0c53c307699190e562016ff1b697",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7c1e2e3c49cce288d37f57d3b2c28e23ce5292465f1109c2739213cee7a582e9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallEcrecover0_completeReturnValue_d0g0v0_Frontier" : {
+    "CallEcrecover0_completeReturnValue_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/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015c24",
-                    "hash" : "0xb0567b56442561e41e2fa3c9faa93a2f7c678f04dbda96914b83c9409a7473b8",
-                    "mixHash" : "0x8d3ed0e79ada99bd0c9018cb6dd1e37e70eef602a1257bead2a32de179bd5cd6",
-                    "nonce" : "0x67e1ba1d16110d11",
+                    "gasUsed" : "0x015eb8",
+                    "hash" : "0xaa29144afcce3e9cba4f6ac0a2f4066dd69509b8f7f92c0c22baa014d0ec0575",
+                    "mixHash" : "0x46da9dc084bed3165d1d2c3bf61364d86bc2e31606e1c47b591c5c8b1e3ccff1",
+                    "nonce" : "0xdb59d5efdd0f97c7",
                     "number" : "0x01",
                     "parentHash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
-                    "receiptTrie" : "0x560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8",
-                    "stateRoot" : "0xaf3a7aea41c4fe0f59be0af7dd59ea2a600a35902fc46aa74a50115680c14037",
+                    "receiptTrie" : "0x1502eb0ee73f230804475a4605ae8fd8f4e71b2d8362e668b4cc1385215302f0",
+                    "stateRoot" : "0xd8f85eb1d5a6169e675b8588a800962dbdfeb319f3fe1216f0b3235045945cac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af3a7aea41c4fe0f59be0af7dd59ea2a600a35902fc46aa74a50115680c14037a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015c248203e880a08d3ed0e79ada99bd0c9018cb6dd1e37e70eef602a1257bead2a32de179bd5cd68867e1ba1d16110d11f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8f85eb1d5a6169e675b8588a800962dbdfeb319f3fe1216f0b3235045945caca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01502eb0ee73f230804475a4605ae8fd8f4e71b2d8362e668b4cc1385215302f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015eb88203e880a046da9dc084bed3165d1d2c3bf61364d86bc2e31606e1c47b591c5c8b1e3ccff188db59d5efdd0f97c7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0567b56442561e41e2fa3c9faa93a2f7c678f04dbda96914b83c9409a7473b8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xaa29144afcce3e9cba4f6ac0a2f4066dd69509b8f7f92c0c22baa014d0ec0575",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55c24",
+                "balance" : "0x4563918244f55eb8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7611d3c",
+                "balance" : "0x0de0b6b3a7611aa8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallEcrecover0_completeReturnValue_d0g0v0_Homestead" : {
+    "CallEcrecover0_completeReturnValue_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xfd10",
+                    "hash" : "0x56341230cad94674a390b76b8c2139bf67cce20140dd15958ce753d4fb5e59e0",
+                    "mixHash" : "0xcd8d689bb21ea8bfcfe00b61b008c17e4255ebb2eacbe47bd243c117aa3edbc2",
+                    "nonce" : "0x98d66427149fea61",
+                    "number" : "0x01",
+                    "parentHash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
+                    "receiptTrie" : "0x8b1567329f4a308e6004d13a98db59258fd4ea2d4343da84b3482a1f3821b963",
+                    "stateRoot" : "0x8000e6890444dd8f128ea4f890bde73847f16ba73cfec32a145a51355949bd2a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08000e6890444dd8f128ea4f890bde73847f16ba73cfec32a145a51355949bd2aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08b1567329f4a308e6004d13a98db59258fd4ea2d4343da84b3482a1f3821b963b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a0cd8d689bb21ea8bfcfe00b61b008c17e4255ebb2eacbe47bd243c117aa3edbc28898d66427149fea61f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x56341230cad94674a390b76b8c2139bf67cce20140dd15958ce753d4fb5e59e0",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4fd10",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7617c50",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_completeReturnValue_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/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015c24",
-                    "hash" : "0x2e0c06f2c7d7de7aa626789b14fc68a45667dafd7b71e89be642f6f6261131b7",
-                    "mixHash" : "0xc64927a67b4722bc261603872693853cb1b1d29693dec5edd749db7641cde544",
-                    "nonce" : "0xc617186e2469af09",
+                    "hash" : "0x7159df4745423e5212aac0fd7c871d23ed81df235f8cebce1aa3751546f42e96",
+                    "mixHash" : "0xe82d8589a92bc360cc9485fa91a466d971c7a8ce7cf5a014d8929077626255a7",
+                    "nonce" : "0xd6630610ebfcb207",
                     "number" : "0x01",
                     "parentHash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
                     "receiptTrie" : "0x560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af3a7aea41c4fe0f59be0af7dd59ea2a600a35902fc46aa74a50115680c14037a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015c248203e880a0c64927a67b4722bc261603872693853cb1b1d29693dec5edd749db7641cde54488c617186e2469af09f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af3a7aea41c4fe0f59be0af7dd59ea2a600a35902fc46aa74a50115680c14037a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015c248203e880a0e82d8589a92bc360cc9485fa91a466d971c7a8ce7cf5a014d8929077626255a788d6630610ebfcb207f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e0c06f2c7d7de7aa626789b14fc68a45667dafd7b71e89be642f6f6261131b7",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7159df4745423e5212aac0fd7c871d23ed81df235f8cebce1aa3751546f42e96",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallEcrecover0_completeReturnValue_d0g0v0_Metropolis" : {
+    "CallEcrecover0_completeReturnValue_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/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xfd10",
-                    "hash" : "0x430c65a32bd54e1cacea031c794e45314165c0cbbb088810a41e8dc5ea2e12c0",
-                    "mixHash" : "0x5864e681eea53d271e4b5bda87ba1b82183c988d50eb1e638fd0dc575164b0cc",
-                    "nonce" : "0xcf87c57fafff3c3f",
+                    "gasUsed" : "0x015c24",
+                    "hash" : "0x70207e6074d3d9e51c5619d232aaaa63db5c6758cdbe1c5e88007375f3555793",
+                    "mixHash" : "0x7a45366c0fd6bd173f8d526b3098b6f7d30ec13f96ead4b5ad469d02eee4f8ae",
+                    "nonce" : "0x66334cfa361bbc03",
                     "number" : "0x01",
                     "parentHash" : "0x8ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4",
-                    "receiptTrie" : "0xe764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7",
-                    "stateRoot" : "0x4df0ef6972199e9df036f946ca530df8c4ff17b942ecba38a63ab9e4b4327fb7",
+                    "receiptTrie" : "0x560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8",
+                    "stateRoot" : "0xaf3a7aea41c4fe0f59be0af7dd59ea2a600a35902fc46aa74a50115680c14037",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04df0ef6972199e9df036f946ca530df8c4ff17b942ecba38a63ab9e4b4327fb7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e764903735305454f8d69d7f882dbdf7a89fb93d2bcfea783b908cdc842562f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fd108203e880a05864e681eea53d271e4b5bda87ba1b82183c988d50eb1e638fd0dc575164b0cc88cf87c57fafff3c3ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a08ef0208ec52e3e68a08cbcec73f818860e910044ef86c4f29403817b0f9e3ac4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af3a7aea41c4fe0f59be0af7dd59ea2a600a35902fc46aa74a50115680c14037a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0560df27ed1f4277e5ae2d8262a61449ac7b49c4ee03184073578a055d193b2e8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015c248203e880a07a45366c0fd6bd173f8d526b3098b6f7d30ec13f96ead4b5ad469d02eee4f8ae8866334cfa361bbc03f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8fd8c7bdd0144a80790cb951b469adec81d5fe2038aa736962d332d57bcc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x430c65a32bd54e1cacea031c794e45314165c0cbbb088810a41e8dc5ea2e12c0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x70207e6074d3d9e51c5619d232aaaa63db5c6758cdbe1c5e88007375f3555793",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fd10",
+                "balance" : "0x4563918244f55c24",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617c50",
+                "balance" : "0x0de0b6b3a7611d3c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_d0g0v0.json
index b010fd419..44fb46310 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_d0g0v0_EIP150" : {
+    "CallEcrecover0_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/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01adca",
-                    "hash" : "0x4b3f8b6f42bad8646b1c677010faa595060d651544cb40235400e51a9ebfd400",
-                    "mixHash" : "0xbcdc01a5f102fd13a9c7ce2bab6650a7fdd32c7d842c53636b415d5f9b8a9ff9",
-                    "nonce" : "0x604319dd0f87b638",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x353b9fb4283c5fa987e756ef7a8e4bcc64a2d328e7ddc3bf6a2b4cdfb5dd4719",
+                    "mixHash" : "0x0510368f1f975aca149a0186770d233150912d8b3e9158bddd23adf1ff9c5e3e",
+                    "nonce" : "0x5ace88d3c301d3f0",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0xf6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4",
-                    "stateRoot" : "0x9f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xfeac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adca8203e880a0bcdc01a5f102fd13a9c7ce2bab6650a7fdd32c7d842c53636b415d5f9b8a9ff988604319dd0f87b638f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a00510368f1f975aca149a0186770d233150912d8b3e9158bddd23adf1ff9c5e3e885ace88d3c301d3f0f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b3f8b6f42bad8646b1c677010faa595060d651544cb40235400e51a9ebfd400",
-        "network" : "EIP150",
+        "lastblockhash" : "0x353b9fb4283c5fa987e756ef7a8e4bcc64a2d328e7ddc3bf6a2b4cdfb5dd4719",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -83,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5adca",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cb96",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -114,10 +114,10 @@
             }
         }
     },
-    "CallEcrecover0_d0g0v0_EIP158" : {
+    "CallEcrecover0_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/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c4a",
-                    "hash" : "0x534191e71000057018be097cb19b2e7a7a70640cc30b5fce5aacbfe760aff3c2",
-                    "mixHash" : "0x6f2f590a8b75457e271ec96d24a25785e81820980de5ca810403ba55c09872b9",
-                    "nonce" : "0xbb5cd0943875b1f7",
+                    "hash" : "0xf66468ad7536ca3ca39678bc93c96f703420c60f93fe15ecf6831cb5a02f9e4a",
+                    "mixHash" : "0xdcef6b9843e393b5ecb0f0bf173e5b94b35e1e109a2943e6627582d7d117831b",
+                    "nonce" : "0x1b3738ad197a4226",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0x9714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829",
-                    "stateRoot" : "0x0e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xfeac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a09714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a06f2f590a8b75457e271ec96d24a25785e81820980de5ca810403ba55c09872b988bb5cd0943875b1f7f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0dcef6b9843e393b5ecb0f0bf173e5b94b35e1e109a2943e6627582d7d117831b881b3738ad197a4226f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -177,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x534191e71000057018be097cb19b2e7a7a70640cc30b5fce5aacbfe760aff3c2",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf66468ad7536ca3ca39678bc93c96f703420c60f93fe15ecf6831cb5a02f9e4a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
@@ -222,10 +229,10 @@
             }
         }
     },
-    "CallEcrecover0_d0g0v0_Frontier" : {
+    "CallEcrecover0_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/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01aaa0",
-                    "hash" : "0x61cb2ef73733e584dda8e400933c39605ff52c2bae5032b145f8ceb2b1c31f1c",
-                    "mixHash" : "0x994fb3b32554ea9e6a64f55eb2fc07533d6c3eda77b3924374dba51e615d5630",
-                    "nonce" : "0x283e9e7849c6fb64",
+                    "gasUsed" : "0x01adca",
+                    "hash" : "0xfd01630034ca11b761996a429ccfaff1a6a70f2d4085e8685555e2b4fea29a81",
+                    "mixHash" : "0x8c33df9f6e874b97a922fbf484d6a088ac7e72e2020e424b6fdc2cbf57393c69",
+                    "nonce" : "0x991b769a90bcd0f7",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0x74143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4",
-                    "stateRoot" : "0x2064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88f",
+                    "receiptTrie" : "0xf6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4",
+                    "stateRoot" : "0x9f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0994fb3b32554ea9e6a64f55eb2fc07533d6c3eda77b3924374dba51e615d563088283e9e7849c6fb64f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adca8203e880a08c33df9f6e874b97a922fbf484d6a088ac7e72e2020e424b6fdc2cbf57393c6988991b769a90bcd0f7f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -285,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61cb2ef73733e584dda8e400933c39605ff52c2bae5032b145f8ceb2b1c31f1c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfd01630034ca11b761996a429ccfaff1a6a70f2d4085e8685555e2b4fea29a81",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -306,14 +313,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5aaa0",
+                "balance" : "0x4563918244f5adca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cec0",
+                "balance" : "0x0de0b6b3a760cb96",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,10 +344,118 @@
             }
         }
     },
-    "CallEcrecover0_d0g0v0_Homestead" : {
+    "CallEcrecover0_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/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x2d34e013229ee5690b765d7781d79bd7239a2598d6fa3237ae8af1a98b8e21b6",
+                    "mixHash" : "0x652c2db98a9baa8fe6aa9b480f184e73d929746b450d5b6cda2c55400661c634",
+                    "nonce" : "0x6d1a4c0b318c441b",
+                    "number" : "0x01",
+                    "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
+                    "receiptTrie" : "0x9714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829",
+                    "stateRoot" : "0x0e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a09714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0652c2db98a9baa8fe6aa9b480f184e73d929746b450d5b6cda2c55400661c634886d1a4c0b318c441bf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2d34e013229ee5690b765d7781d79bd7239a2598d6fa3237ae8af1a98b8e21b6",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f54c4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7612d16",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +467,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01aaa0",
-                    "hash" : "0xd7b2fbb9a565720794224bd3cf18006645e0c753324ab6cd73acf36e0591063b",
-                    "mixHash" : "0xdceb2b1988fedd3858f2bfdf2b4d57d54bc3d65bf72fe5d28c5f2629fe21c9c1",
-                    "nonce" : "0x08a844710c2a2d1a",
+                    "hash" : "0x8849e3544ab0648f6e0ad166fe8b1997867277fe5efa14dec8bec59b73c336e3",
+                    "mixHash" : "0xe618668e3e781e1cc47065e6430f87fa5c0c9b62191402d5afa9ff54a2eae0eb",
+                    "nonce" : "0x4ae98d86a422f2cc",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
                     "receiptTrie" : "0x74143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4",
@@ -363,7 +478,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0dceb2b1988fedd3858f2bfdf2b4d57d54bc3d65bf72fe5d28c5f2629fe21c9c18808a844710c2a2d1af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0e618668e3e781e1cc47065e6430f87fa5c0c9b62191402d5afa9ff54a2eae0eb884ae98d86a422f2ccf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,8 +515,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7b2fbb9a565720794224bd3cf18006645e0c753324ab6cd73acf36e0591063b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8849e3544ab0648f6e0ad166fe8b1997867277fe5efa14dec8bec59b73c336e3",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -452,10 +567,10 @@
             }
         }
     },
-    "CallEcrecover0_d0g0v0_Metropolis" : {
+    "CallEcrecover0_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/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,19 +581,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c4a",
-                    "hash" : "0x63438c9133c7cbdf6b7e411556ced80f3bee35ef2b75a29cb8c8a8fc297479e9",
-                    "mixHash" : "0x2f6f58b699769f1df93058006745efaccccc3840dc4d29f2445dc79e77f71707",
-                    "nonce" : "0x55799f172f6a10d6",
+                    "gasUsed" : "0x01aaa0",
+                    "hash" : "0x8ec2bb7a85531fbd22ffb6ac9431f4f75c3950df9ff6a79b29abb6fb9a04b370",
+                    "mixHash" : "0x10d91cdda0a1ecbeae80d26ef396eb74ad5eba24c90e88a44bf67ff3929cfd28",
+                    "nonce" : "0x5cdba8a8c5ffcbd8",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
-                    "stateRoot" : "0xfeac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abf",
+                    "receiptTrie" : "0x74143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4",
+                    "stateRoot" : "0x2064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a02f6f58b699769f1df93058006745efaccccc3840dc4d29f2445dc79e77f717078855799f172f6a10d6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a010d91cdda0a1ecbeae80d26ef396eb74ad5eba24c90e88a44bf67ff3929cfd28885cdba8a8c5ffcbd8f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -515,10 +630,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63438c9133c7cbdf6b7e411556ced80f3bee35ef2b75a29cb8c8a8fc297479e9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8ec2bb7a85531fbd22ffb6ac9431f4f75c3950df9ff6a79b29abb6fb9a04b370",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -536,14 +651,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c4a",
+                "balance" : "0x4563918244f5aaa0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d16",
+                "balance" : "0x0de0b6b3a760cec0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0.json
index c49075e56..5891e75c1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_gas3000_d0g0v0_EIP150" : {
+    "CallEcrecover0_gas3000_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/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01adca",
-                    "hash" : "0xf93ce9bc6a6005f36d4fce4e36a595af83c7f63dabcb7ed5c60ec9f0eb1830d5",
-                    "mixHash" : "0xc8e73a9394d29a135a3565c5d743412fefa4ee55c8741afd307021c99c3f02e5",
-                    "nonce" : "0x66af3cc3f5fbbbb7",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0xb0c8c883016cfe77cebb38d09798aa5d8fe66f452964cc635dca6ee401b0b951",
+                    "mixHash" : "0x3e233a7098517d9296d7307b1071ccc2f7ef3bbea874b52a0947fe7a94073701",
+                    "nonce" : "0xd123e2558d57ceb3",
                     "number" : "0x01",
                     "parentHash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
-                    "receiptTrie" : "0x03cc8219f8f3054d41f30b52410629e13806a193e29dd3f17023892cf438df2c",
-                    "stateRoot" : "0xa7266c0a5bf2fa1565eeadc022c8dd13751ef8ac67e7db786abf3c3c321cdefa",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0x2689b5139756a72fe273d36c886558bd9169543c55d4042133e5095854ae6159",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7266c0a5bf2fa1565eeadc022c8dd13751ef8ac67e7db786abf3c3c321cdefaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba003cc8219f8f3054d41f30b52410629e13806a193e29dd3f17023892cf438df2cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adca8203e880a0c8e73a9394d29a135a3565c5d743412fefa4ee55c8741afd307021c99c3f02e58866af3cc3f5fbbbb7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02689b5139756a72fe273d36c886558bd9169543c55d4042133e5095854ae6159a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a03e233a7098517d9296d7307b1071ccc2f7ef3bbea874b52a0947fe7a9407370188d123e2558d57ceb3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf93ce9bc6a6005f36d4fce4e36a595af83c7f63dabcb7ed5c60ec9f0eb1830d5",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb0c8c883016cfe77cebb38d09798aa5d8fe66f452964cc635dca6ee401b0b951",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -83,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5adca",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cb96",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -114,10 +114,10 @@
             }
         }
     },
-    "CallEcrecover0_gas3000_d0g0v0_EIP158" : {
+    "CallEcrecover0_gas3000_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/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c4a",
-                    "hash" : "0xdb0696277ffc77ebd542d3f9d8a2db3dc566e1bfaa8f34a9e9ed77d27c34eea0",
-                    "mixHash" : "0xeacfbf37ccb5e7fbca09f02842174634c91e5f0bcbd61a463e4427864b2b1a65",
-                    "nonce" : "0xb4fe2a33d83e92ea",
+                    "hash" : "0xc3842162d2dc5f8a3a4c16acaf0d846595351408e21586c81eed742e0d8c3428",
+                    "mixHash" : "0xb6a4b968565669c9bcbd3a90668c8f8877bb4664fdd058d9c87793ce6d9e6d46",
+                    "nonce" : "0x3c824d67a9848377",
                     "number" : "0x01",
                     "parentHash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
-                    "receiptTrie" : "0xccb0d526a8e523a348018c0d266d36f19846244866750b12196dd2c4a7e407a8",
-                    "stateRoot" : "0x2cf23e253cc3af6b6f193449bb89fd31d8b9720f6eb6ff08e9fc7b76dd333611",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0x2689b5139756a72fe273d36c886558bd9169543c55d4042133e5095854ae6159",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cf23e253cc3af6b6f193449bb89fd31d8b9720f6eb6ff08e9fc7b76dd333611a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ccb0d526a8e523a348018c0d266d36f19846244866750b12196dd2c4a7e407a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0eacfbf37ccb5e7fbca09f02842174634c91e5f0bcbd61a463e4427864b2b1a6588b4fe2a33d83e92eaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02689b5139756a72fe273d36c886558bd9169543c55d4042133e5095854ae6159a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0b6a4b968565669c9bcbd3a90668c8f8877bb4664fdd058d9c87793ce6d9e6d46883c824d67a9848377f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -177,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb0696277ffc77ebd542d3f9d8a2db3dc566e1bfaa8f34a9e9ed77d27c34eea0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc3842162d2dc5f8a3a4c16acaf0d846595351408e21586c81eed742e0d8c3428",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f160025560a060020a608051066000556000543214600155",
@@ -222,10 +229,10 @@
             }
         }
     },
-    "CallEcrecover0_gas3000_d0g0v0_Frontier" : {
+    "CallEcrecover0_gas3000_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/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01aaa0",
-                    "hash" : "0x58d31a8a774c79fdde45afcb6514d4c459f479e0093f2f2d3b83100f05cfcbb6",
-                    "mixHash" : "0x58ea648443c7e5626a516db85f1cec9a7fc148056dfba98a5564affe827c5f04",
-                    "nonce" : "0x61c22fc197fd5410",
+                    "gasUsed" : "0x01adca",
+                    "hash" : "0x0fa94ffda9763c40e904d275f14cfad45836cf6f231de609390808c3e209cf56",
+                    "mixHash" : "0xa44414ab4fc0d752ce6c4b9c7421120d99c0621a5d31c90cebd445eb32cb7282",
+                    "nonce" : "0x8c30c48fe8848bfd",
                     "number" : "0x01",
                     "parentHash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
-                    "receiptTrie" : "0xa51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98",
-                    "stateRoot" : "0x915b6e659c464ebd7f092166c1dade258e654d26be17a7ea2f3d693563d47313",
+                    "receiptTrie" : "0x03cc8219f8f3054d41f30b52410629e13806a193e29dd3f17023892cf438df2c",
+                    "stateRoot" : "0xa7266c0a5bf2fa1565eeadc022c8dd13751ef8ac67e7db786abf3c3c321cdefa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0915b6e659c464ebd7f092166c1dade258e654d26be17a7ea2f3d693563d47313a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a058ea648443c7e5626a516db85f1cec9a7fc148056dfba98a5564affe827c5f048861c22fc197fd5410f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7266c0a5bf2fa1565eeadc022c8dd13751ef8ac67e7db786abf3c3c321cdefaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba003cc8219f8f3054d41f30b52410629e13806a193e29dd3f17023892cf438df2cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adca8203e880a0a44414ab4fc0d752ce6c4b9c7421120d99c0621a5d31c90cebd445eb32cb7282888c30c48fe8848bfdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -285,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58d31a8a774c79fdde45afcb6514d4c459f479e0093f2f2d3b83100f05cfcbb6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0fa94ffda9763c40e904d275f14cfad45836cf6f231de609390808c3e209cf56",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -306,14 +313,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5aaa0",
+                "balance" : "0x4563918244f5adca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cec0",
+                "balance" : "0x0de0b6b3a760cb96",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,10 +344,118 @@
             }
         }
     },
-    "CallEcrecover0_gas3000_d0g0v0_Homestead" : {
+    "CallEcrecover0_gas3000_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/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0x77b3aa051891a11a1b08bb8fbf26bd74be8f4830bbf6d0a8bca2602d109f760e",
+                    "mixHash" : "0xd088557b64c72f570c333e7b4eb7654081fed432f8028067fecfc1fa8f700fc1",
+                    "nonce" : "0xc8278ca3e7e4dc8e",
+                    "number" : "0x01",
+                    "parentHash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
+                    "receiptTrie" : "0xccb0d526a8e523a348018c0d266d36f19846244866750b12196dd2c4a7e407a8",
+                    "stateRoot" : "0x2cf23e253cc3af6b6f193449bb89fd31d8b9720f6eb6ff08e9fc7b76dd333611",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cf23e253cc3af6b6f193449bb89fd31d8b9720f6eb6ff08e9fc7b76dd333611a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ccb0d526a8e523a348018c0d266d36f19846244866750b12196dd2c4a7e407a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0d088557b64c72f570c333e7b4eb7654081fed432f8028067fecfc1fa8f700fc188c8278ca3e7e4dc8ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x77b3aa051891a11a1b08bb8fbf26bd74be8f4830bbf6d0a8bca2602d109f760e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f54c4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7612d16",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_gas3000_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +467,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01aaa0",
-                    "hash" : "0x5f582b37d0a903becc5af5518e256a99f4f53f58863bfc785bb354343fcb6d71",
-                    "mixHash" : "0xc67677321a418fbb9b33e4da57767b666b9171e8f3021942cdffdb70e8752024",
-                    "nonce" : "0x686f8ae22f5719f8",
+                    "hash" : "0x95f05044770acc9b2be1e91119699363553a919229bebcee2a5cc1823dd1f9a8",
+                    "mixHash" : "0x7b4dacc67830080498e23a69d4f2fbf50fa028f025b82c8e510af969fc662818",
+                    "nonce" : "0xbc5a99fde7856340",
                     "number" : "0x01",
                     "parentHash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
                     "receiptTrie" : "0xa51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98",
@@ -363,7 +478,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0915b6e659c464ebd7f092166c1dade258e654d26be17a7ea2f3d693563d47313a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0c67677321a418fbb9b33e4da57767b666b9171e8f3021942cdffdb70e875202488686f8ae22f5719f8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0915b6e659c464ebd7f092166c1dade258e654d26be17a7ea2f3d693563d47313a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a07b4dacc67830080498e23a69d4f2fbf50fa028f025b82c8e510af969fc66281888bc5a99fde7856340f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,8 +515,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f582b37d0a903becc5af5518e256a99f4f53f58863bfc785bb354343fcb6d71",
-        "network" : "Homestead",
+        "lastblockhash" : "0x95f05044770acc9b2be1e91119699363553a919229bebcee2a5cc1823dd1f9a8",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -452,10 +567,10 @@
             }
         }
     },
-    "CallEcrecover0_gas3000_d0g0v0_Metropolis" : {
+    "CallEcrecover0_gas3000_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/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,19 +581,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c4a",
-                    "hash" : "0xc6210945d5577fb320aaa98cfc6a6ccdcd09865d65ff23fd81443fa34a9ea2cf",
-                    "mixHash" : "0x3f4607a6ac69c2eb0c13def448a77c8d70ed0a2eb6b2948d88c34a42e74194fa",
-                    "nonce" : "0xac84209518d438e7",
+                    "gasUsed" : "0x01aaa0",
+                    "hash" : "0x4a0df4ceeeddd645d2e1d208b0b1514bac62eb62641f990d4bec8549771ad59b",
+                    "mixHash" : "0xf5a544128eeb68b01cc266bd2cc85bbeacb3be573a74d57269a5c5131e473738",
+                    "nonce" : "0x212375e0b56d23e1",
                     "number" : "0x01",
                     "parentHash" : "0x422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62",
-                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
-                    "stateRoot" : "0x2689b5139756a72fe273d36c886558bd9169543c55d4042133e5095854ae6159",
+                    "receiptTrie" : "0xa51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98",
+                    "stateRoot" : "0x915b6e659c464ebd7f092166c1dade258e654d26be17a7ea2f3d693563d47313",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02689b5139756a72fe273d36c886558bd9169543c55d4042133e5095854ae6159a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a03f4607a6ac69c2eb0c13def448a77c8d70ed0a2eb6b2948d88c34a42e74194fa88ac84209518d438e7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0422692d70c86098e9e3c8c628c757b884c42905a22e4852f10f5932e42393f62a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0915b6e659c464ebd7f092166c1dade258e654d26be17a7ea2f3d693563d47313a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a51c9829f4136f894dce1fe415418d3014be4f98bb803ba45460f5a1d675ca98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0f5a544128eeb68b01cc266bd2cc85bbeacb3be573a74d57269a5c5131e47373888212375e0b56d23e1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -515,10 +630,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad872c0446daa8987fb5039a27ae109615b5f9eb1635a984f86aa3bd8605401a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6210945d5577fb320aaa98cfc6a6ccdcd09865d65ff23fd81443fa34a9ea2cf",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4a0df4ceeeddd645d2e1d208b0b1514bac62eb62641f990d4bec8549771ad59b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -536,14 +651,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c4a",
+                "balance" : "0x4563918244f5aaa0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d16",
+                "balance" : "0x0de0b6b3a760cec0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0.json
index 86fe1689d..018564280 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover0_overlappingInputOutput_d0g0v0_EIP150" : {
+    "CallEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01adc7",
-                    "hash" : "0x36dc356f2a51858eb737d3af3a5a6018a3535e523d8d3981a26beb0636ea193d",
-                    "mixHash" : "0xe32f4630a1c156787c1e39856e419b565dcd2a5cf47affd17842c01804808943",
-                    "nonce" : "0xbc7d6f0b2742b767",
+                    "gasUsed" : "0x014c47",
+                    "hash" : "0xd3ef0ba492e67a881755881b17ea4c7c444500488f63282d481fc507374bab51",
+                    "mixHash" : "0x029e9572c51abac616033080f89f1748a21ff2d7e28584485b293aad8cc2fa94",
+                    "nonce" : "0x2cbad61de00ec7ba",
                     "number" : "0x01",
                     "parentHash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
-                    "receiptTrie" : "0xe654c33db83069c73f0f7b9715422ec57f5bb79b40134cf0c851bbb5014c055a",
-                    "stateRoot" : "0xf241382ba2a2e4b1666372eeb8d336ba4beba459dd511c875cb0fe32b8f6479e",
+                    "receiptTrie" : "0xa26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715",
+                    "stateRoot" : "0xeb0b5e6422d72664ec5d62d9ccd1fad83d5579ef303d46295af8cb0142b148ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f241382ba2a2e4b1666372eeb8d336ba4beba459dd511c875cb0fe32b8f6479ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e654c33db83069c73f0f7b9715422ec57f5bb79b40134cf0c851bbb5014c055ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adc78203e880a0e32f4630a1c156787c1e39856e419b565dcd2a5cf47affd17842c0180480894388bc7d6f0b2742b767f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb0b5e6422d72664ec5d62d9ccd1fad83d5579ef303d46295af8cb0142b148cea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a0029e9572c51abac616033080f89f1748a21ff2d7e28584485b293aad8cc2fa94882cbad61de00ec7baf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36dc356f2a51858eb737d3af3a5a6018a3535e523d8d3981a26beb0636ea193d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd3ef0ba492e67a881755881b17ea4c7c444500488f63282d481fc507374bab51",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -83,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5adc7",
+                "balance" : "0x4563918244f54c47",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cb99",
+                "balance" : "0x0de0b6b3a7612d19",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -114,10 +114,10 @@
             }
         }
     },
-    "CallEcrecover0_overlappingInputOutput_d0g0v0_EIP158" : {
+    "CallEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c47",
-                    "hash" : "0x806da26b4192cee84b7dfc9fe4627e0347395c0658d345e98eaa401140a0367a",
-                    "mixHash" : "0x0ea1f1619b98dfadd0c6b4cd3f1a89f11f8203e357a2f4744fe2a4f19e9bd8be",
-                    "nonce" : "0xae4e7e6eb49f3853",
+                    "hash" : "0xaa06333e3df546b43e4faeaa4f6733b469442afe5072ad3dec6084ffcce7cccc",
+                    "mixHash" : "0x8f2c0db767c916cfedca1970a89b5e5355a958fdb838602312da4028e3ed1d40",
+                    "nonce" : "0x7b0cb83eafc013d4",
                     "number" : "0x01",
                     "parentHash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
-                    "receiptTrie" : "0x941345094961d08a0cabe5016b4506eb6c7c0df1c6599319403cbf42305c8d09",
-                    "stateRoot" : "0xb3beb4c95fe063536ff283462cab422d1e3ea90d03c2d9b15bdc01f841f64fc1",
+                    "receiptTrie" : "0xa26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715",
+                    "stateRoot" : "0xeb0b5e6422d72664ec5d62d9ccd1fad83d5579ef303d46295af8cb0142b148ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3beb4c95fe063536ff283462cab422d1e3ea90d03c2d9b15bdc01f841f64fc1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0941345094961d08a0cabe5016b4506eb6c7c0df1c6599319403cbf42305c8d09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a00ea1f1619b98dfadd0c6b4cd3f1a89f11f8203e357a2f4744fe2a4f19e9bd8be88ae4e7e6eb49f3853f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb0b5e6422d72664ec5d62d9ccd1fad83d5579ef303d46295af8cb0142b148cea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a08f2c0db767c916cfedca1970a89b5e5355a958fdb838602312da4028e3ed1d40887b0cb83eafc013d4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -177,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x806da26b4192cee84b7dfc9fe4627e0347395c0658d345e98eaa401140a0367a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xaa06333e3df546b43e4faeaa4f6733b469442afe5072ad3dec6084ffcce7cccc",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155",
@@ -222,10 +229,10 @@
             }
         }
     },
-    "CallEcrecover0_overlappingInputOutput_d0g0v0_Frontier" : {
+    "CallEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01aa9d",
-                    "hash" : "0x84ead429f68e4cd16c0b3edd268687b23682ec7d704149bed73f20548a6883b7",
-                    "mixHash" : "0xda5c91bc1aac9a2c9ddd908022436a8bae08b8fe2eb909961e96401f9da51f01",
-                    "nonce" : "0x56df2da53af6988d",
+                    "gasUsed" : "0x01adc7",
+                    "hash" : "0xeca0d0ecc669618a78e53ce27d0629bf4cd94e8aa7b69dea667c5918caced542",
+                    "mixHash" : "0x92351dbcf28765035b943c7058d550d38bc1b719dcb12fecec331f5c9d5be89d",
+                    "nonce" : "0x9a7fc8c80d1cf62d",
                     "number" : "0x01",
                     "parentHash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
-                    "receiptTrie" : "0xc967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0",
-                    "stateRoot" : "0x76ec0f5b1a7404285d890f0df7b7a2f73872eef973e86c7620aaad651e49922a",
+                    "receiptTrie" : "0xe654c33db83069c73f0f7b9715422ec57f5bb79b40134cf0c851bbb5014c055a",
+                    "stateRoot" : "0xf241382ba2a2e4b1666372eeb8d336ba4beba459dd511c875cb0fe32b8f6479e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ec0f5b1a7404285d890f0df7b7a2f73872eef973e86c7620aaad651e49922aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa9d8203e880a0da5c91bc1aac9a2c9ddd908022436a8bae08b8fe2eb909961e96401f9da51f018856df2da53af6988df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f241382ba2a2e4b1666372eeb8d336ba4beba459dd511c875cb0fe32b8f6479ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e654c33db83069c73f0f7b9715422ec57f5bb79b40134cf0c851bbb5014c055ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adc78203e880a092351dbcf28765035b943c7058d550d38bc1b719dcb12fecec331f5c9d5be89d889a7fc8c80d1cf62df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -285,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84ead429f68e4cd16c0b3edd268687b23682ec7d704149bed73f20548a6883b7",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeca0d0ecc669618a78e53ce27d0629bf4cd94e8aa7b69dea667c5918caced542",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -306,14 +313,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5aa9d",
+                "balance" : "0x4563918244f5adc7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cec3",
+                "balance" : "0x0de0b6b3a760cb99",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,10 +344,118 @@
             }
         }
     },
-    "CallEcrecover0_overlappingInputOutput_d0g0v0_Homestead" : {
+    "CallEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x014c47",
+                    "hash" : "0x95772b527c622091d1b6b085ee56d98c30370ee8302348820741d76b65302fab",
+                    "mixHash" : "0x6a25dbde23eece4cfbcd4b5af45f4b51f7c3161b7872c2afd4948d0b8c90963d",
+                    "nonce" : "0xf6dc3efdeb2a0123",
+                    "number" : "0x01",
+                    "parentHash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
+                    "receiptTrie" : "0x941345094961d08a0cabe5016b4506eb6c7c0df1c6599319403cbf42305c8d09",
+                    "stateRoot" : "0xb3beb4c95fe063536ff283462cab422d1e3ea90d03c2d9b15bdc01f841f64fc1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3beb4c95fe063536ff283462cab422d1e3ea90d03c2d9b15bdc01f841f64fc1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0941345094961d08a0cabe5016b4506eb6c7c0df1c6599319403cbf42305c8d09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a06a25dbde23eece4cfbcd4b5af45f4b51f7c3161b7872c2afd4948d0b8c90963d88f6dc3efdeb2a0123f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x95772b527c622091d1b6b085ee56d98c30370ee8302348820741d76b65302fab",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f54c47",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7612d19",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover0_overlappingInputOutput_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +467,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01aa9d",
-                    "hash" : "0xb5acabf26c4bccab0d168a9df219203ea8b2a7ecd44b2db9cd5699bfa0ee1207",
-                    "mixHash" : "0x8018098cbe1eae2f9e212bba8ceab14768d6a99d2c9df688a7078826d4da300e",
-                    "nonce" : "0x9f4c0a5e93418dac",
+                    "hash" : "0xecc6ec943fabfe0dcfd3f7865bffa5161a1f369595a54529f91116bcb898dd97",
+                    "mixHash" : "0xbe2dc3eea717373e27dee5b355bab3a43558b7489bb54d56101c53e9d6db5371",
+                    "nonce" : "0x5efe31cf29e60ecf",
                     "number" : "0x01",
                     "parentHash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
                     "receiptTrie" : "0xc967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0",
@@ -363,7 +478,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ec0f5b1a7404285d890f0df7b7a2f73872eef973e86c7620aaad651e49922aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa9d8203e880a08018098cbe1eae2f9e212bba8ceab14768d6a99d2c9df688a7078826d4da300e889f4c0a5e93418dacf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ec0f5b1a7404285d890f0df7b7a2f73872eef973e86c7620aaad651e49922aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa9d8203e880a0be2dc3eea717373e27dee5b355bab3a43558b7489bb54d56101c53e9d6db5371885efe31cf29e60ecff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,8 +515,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5acabf26c4bccab0d168a9df219203ea8b2a7ecd44b2db9cd5699bfa0ee1207",
-        "network" : "Homestead",
+        "lastblockhash" : "0xecc6ec943fabfe0dcfd3f7865bffa5161a1f369595a54529f91116bcb898dd97",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -452,10 +567,10 @@
             }
         }
     },
-    "CallEcrecover0_overlappingInputOutput_d0g0v0_Metropolis" : {
+    "CallEcrecover0_overlappingInputOutput_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/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,19 +581,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c47",
-                    "hash" : "0x55f4caa942d4e3be3a60f277616993cb4f7d7412e81df97997d6d04bff7496a1",
-                    "mixHash" : "0xe22d53c2f0072b27c943560b0ca103a55c164460b7cf8dea57f51a0efa9a97cc",
-                    "nonce" : "0xe37e9447f914899e",
+                    "gasUsed" : "0x01aa9d",
+                    "hash" : "0x2fd563128768ee9c60cfe522def6a9356809b4353c0c5512925d269e9c367062",
+                    "mixHash" : "0x83c43914aaebdcc4d438b058f21c5eb05e765c3b537838e04f2129273f583c9a",
+                    "nonce" : "0x14c2ae54c89300d4",
                     "number" : "0x01",
                     "parentHash" : "0x876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422",
-                    "receiptTrie" : "0xa26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715",
-                    "stateRoot" : "0xeb0b5e6422d72664ec5d62d9ccd1fad83d5579ef303d46295af8cb0142b148ce",
+                    "receiptTrie" : "0xc967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0",
+                    "stateRoot" : "0x76ec0f5b1a7404285d890f0df7b7a2f73872eef973e86c7620aaad651e49922a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb0b5e6422d72664ec5d62d9ccd1fad83d5579ef303d46295af8cb0142b148cea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a26d642a694d2c3da8e164abb8cc8629b16a964396ae6968bbb349db9cf32715b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c478203e880a0e22d53c2f0072b27c943560b0ca103a55c164460b7cf8dea57f51a0efa9a97cc88e37e9447f914899ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0876f94ff4dacee9643adeb17a65ca7cb9c21db0a0c3c7d018cd990173de34422a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ec0f5b1a7404285d890f0df7b7a2f73872eef973e86c7620aaad651e49922aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c967c9165f52b36b8d641f283b7b88ce579cb542122166a305ddc846780760c0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa9d8203e880a083c43914aaebdcc4d438b058f21c5eb05e765c3b537838e04f2129273f583c9a8814c2ae54c89300d4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -515,10 +630,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd80539986d2a3b59dd58e801a64e72e3f0629dd8b2ad66c0899e392dc47256fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55f4caa942d4e3be3a60f277616993cb4f7d7412e81df97997d6d04bff7496a1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2fd563128768ee9c60cfe522def6a9356809b4353c0c5512925d269e9c367062",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -536,14 +651,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c47",
+                "balance" : "0x4563918244f5aa9d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d19",
+                "balance" : "0x0de0b6b3a760cec3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover1_d0g0v0.json
index 4534dc43d..d5ae2fcb3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover1_d0g0v0_EIP150" : {
+    "CallEcrecover1_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/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01389a",
-                    "hash" : "0x0dceee101a1f75707eb48f24aac2a7900bd252b8e97ae1e054c4642eee8b51ed",
-                    "mixHash" : "0x32b0b4bcb0a2f1f5346b688f647ab676685e86f7c529eaf4c71d10883f284cd8",
-                    "nonce" : "0x6a6943e46605afc8",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x7d94a7d2fc9747d6444082d051c4d519aca47527c3eaea98e6f346600a7bebbe",
+                    "mixHash" : "0xdf8aae266e956bfd441190efc4b74f541f883cfc627d02e8c038e5578551355a",
+                    "nonce" : "0x90ba3b81a138f56f",
                     "number" : "0x01",
                     "parentHash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
-                    "receiptTrie" : "0x416f22ae408e62749ddba0a681a77e743c76085290db6a5baf12ed692dc0d0a8",
-                    "stateRoot" : "0x5b971613af94db45e90206b46d3d0cadb6b249210cd7edb3237d7059bcb32231",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x63f0bd7b8c1d13149efd6b278277dec3fcd52ea9bf0092321b09fda9b6713bfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b971613af94db45e90206b46d3d0cadb6b249210cd7edb3237d7059bcb32231a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0416f22ae408e62749ddba0a681a77e743c76085290db6a5baf12ed692dc0d0a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a032b0b4bcb0a2f1f5346b688f647ab676685e86f7c529eaf4c71d10883f284cd8886a6943e46605afc8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063f0bd7b8c1d13149efd6b278277dec3fcd52ea9bf0092321b09fda9b6713bfaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0df8aae266e956bfd441190efc4b74f541f883cfc627d02e8c038e5578551355a8890ba3b81a138f56ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0dceee101a1f75707eb48f24aac2a7900bd252b8e97ae1e054c4642eee8b51ed",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7d94a7d2fc9747d6444082d051c4d519aca47527c3eaea98e6f346600a7bebbe",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5389a",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76140c6",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallEcrecover1_d0g0v0_EIP158" : {
+    "CallEcrecover1_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/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x7e0485ad4a60a6826cac19f109da9ef4544ac8a7ee85fabaa96a58ec95dfbeef",
-                    "mixHash" : "0xd54082583a02371bf57a0017c06379dfc271b401f873fd7f678eb2ac264b6cc2",
-                    "nonce" : "0x0e5ee9b5393f8d6e",
+                    "hash" : "0x08a3879b0d1758995abd9631b3255b6096ae3ee9b88d0978e3fb51a1320b5cfc",
+                    "mixHash" : "0x98844729edeeb4955c557ddc11b51e1281314ad38d9d60bbbc0b35ff95f24346",
+                    "nonce" : "0xf1424cba68c153b6",
                     "number" : "0x01",
                     "parentHash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
-                    "receiptTrie" : "0x1602a28f3a6ae58955abe34363c514aed3c2db31d80dfb5225cc53931523fa07",
-                    "stateRoot" : "0xaeb1202a2d993d55f6ed91b2e2dea4a5ec7b1d13d054aa7b3b1ac148df48c798",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x63f0bd7b8c1d13149efd6b278277dec3fcd52ea9bf0092321b09fda9b6713bfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb1202a2d993d55f6ed91b2e2dea4a5ec7b1d13d054aa7b3b1ac148df48c798a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01602a28f3a6ae58955abe34363c514aed3c2db31d80dfb5225cc53931523fa07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0d54082583a02371bf57a0017c06379dfc271b401f873fd7f678eb2ac264b6cc2880e5ee9b5393f8d6ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063f0bd7b8c1d13149efd6b278277dec3fcd52ea9bf0092321b09fda9b6713bfaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a098844729edeeb4955c557ddc11b51e1281314ad38d9d60bbbc0b35ff95f2434688f1424cba68c153b6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e0485ad4a60a6826cac19f109da9ef4544ac8a7ee85fabaa96a58ec95dfbeef",
-        "network" : "EIP158",
+        "lastblockhash" : "0x08a3879b0d1758995abd9631b3255b6096ae3ee9b88d0978e3fb51a1320b5cfc",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallEcrecover1_d0g0v0_Frontier" : {
+    "CallEcrecover1_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/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013570",
-                    "hash" : "0x3b84a1a2f584b9d28879cc58fac662e582138e140221496486ff7f8aa7b6af6a",
-                    "mixHash" : "0xc791b7e1a805a37899258b4fb7cef3bc408e9141ae6f59df32c4313f0a0d4bbd",
-                    "nonce" : "0x956eb5126baa0612",
+                    "gasUsed" : "0x01389a",
+                    "hash" : "0x73d74c9042c31d8d4cf93c88cc194ebcdf48c12a70114ce36f14bd675198fdf4",
+                    "mixHash" : "0x9e574195cecfe12c257a38cf2567baaea34bb73b94c7e9fcdb9403e56d84c6bc",
+                    "nonce" : "0x74f84808a6302914",
                     "number" : "0x01",
                     "parentHash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
-                    "receiptTrie" : "0xab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23",
-                    "stateRoot" : "0xf8a65f5f9b11f9b5394624f69cc8de7de8ab68b9f31e87bd30a9e1ae7548e365",
+                    "receiptTrie" : "0x416f22ae408e62749ddba0a681a77e743c76085290db6a5baf12ed692dc0d0a8",
+                    "stateRoot" : "0x5b971613af94db45e90206b46d3d0cadb6b249210cd7edb3237d7059bcb32231",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a65f5f9b11f9b5394624f69cc8de7de8ab68b9f31e87bd30a9e1ae7548e365a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0c791b7e1a805a37899258b4fb7cef3bc408e9141ae6f59df32c4313f0a0d4bbd88956eb5126baa0612f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b971613af94db45e90206b46d3d0cadb6b249210cd7edb3237d7059bcb32231a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0416f22ae408e62749ddba0a681a77e743c76085290db6a5baf12ed692dc0d0a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a09e574195cecfe12c257a38cf2567baaea34bb73b94c7e9fcdb9403e56d84c6bc8874f84808a6302914f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b84a1a2f584b9d28879cc58fac662e582138e140221496486ff7f8aa7b6af6a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x73d74c9042c31d8d4cf93c88cc194ebcdf48c12a70114ce36f14bd675198fdf4",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53570",
+                "balance" : "0x4563918244f5389a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76143f0",
+                "balance" : "0x0de0b6b3a76140c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallEcrecover1_d0g0v0_Homestead" : {
+    "CallEcrecover1_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/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x7c45b873420d529a6c6dd3d7df1c36520e1482737234a5ea4f718fb7eb87391e",
+                    "mixHash" : "0xa929c2a59d557d348c88cd154a2362942f2fdd017635ee0b6856ec6171f2852a",
+                    "nonce" : "0xb54df1a0b581bad6",
+                    "number" : "0x01",
+                    "parentHash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
+                    "receiptTrie" : "0x1602a28f3a6ae58955abe34363c514aed3c2db31d80dfb5225cc53931523fa07",
+                    "stateRoot" : "0xaeb1202a2d993d55f6ed91b2e2dea4a5ec7b1d13d054aa7b3b1ac148df48c798",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb1202a2d993d55f6ed91b2e2dea4a5ec7b1d13d054aa7b3b1ac148df48c798a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01602a28f3a6ae58955abe34363c514aed3c2db31d80dfb5225cc53931523fa07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0a929c2a59d557d348c88cd154a2362942f2fdd017635ee0b6856ec6171f2852a88b54df1a0b581bad6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7c45b873420d529a6c6dd3d7df1c36520e1482737234a5ea4f718fb7eb87391e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a246",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013570",
-                    "hash" : "0x281cfc876dfada2189a7b0a6f25f2df1a56cbc98aae7d05738043836fbdaf44a",
-                    "mixHash" : "0x5ada47cd56d16877000ed999e296294fab4a43e2f3cfddeaaefc61affdbf85b2",
-                    "nonce" : "0x02fa47ca5d60a446",
+                    "hash" : "0xbf44ae339af78af3b41d437455acc7ae6f6e41af39e2b2520241c7932563b0f5",
+                    "mixHash" : "0xf4b65a763614024136460971075e2aca19d4214f8f670044d1e34240398f594f",
+                    "nonce" : "0x2b9591e393279158",
                     "number" : "0x01",
                     "parentHash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
                     "receiptTrie" : "0xab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a65f5f9b11f9b5394624f69cc8de7de8ab68b9f31e87bd30a9e1ae7548e365a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a05ada47cd56d16877000ed999e296294fab4a43e2f3cfddeaaefc61affdbf85b28802fa47ca5d60a446f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a65f5f9b11f9b5394624f69cc8de7de8ab68b9f31e87bd30a9e1ae7548e365a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0f4b65a763614024136460971075e2aca19d4214f8f670044d1e34240398f594f882b9591e393279158f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x281cfc876dfada2189a7b0a6f25f2df1a56cbc98aae7d05738043836fbdaf44a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbf44ae339af78af3b41d437455acc7ae6f6e41af39e2b2520241c7932563b0f5",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallEcrecover1_d0g0v0_Metropolis" : {
+    "CallEcrecover1_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/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0xff2e3b99c98ba6a720dc997caff5ebe7d7b32914221f6eef7c8bc2fd4f650617",
-                    "mixHash" : "0x6d23c6f6763d61ae864e9bd820abb652528172516ae229cbf61cd60db7ae4f39",
-                    "nonce" : "0x6d6a32b44afac887",
+                    "gasUsed" : "0x013570",
+                    "hash" : "0x3e93e3efa548f33a2a8849251daa5ab3a39567584f405aa550788d4a76244005",
+                    "mixHash" : "0x66ae5c563c29c2a68d56222cba4781e5ac6476315584abd261b0d9b8e57f206a",
+                    "nonce" : "0x055d6de6e8504b84",
                     "number" : "0x01",
                     "parentHash" : "0x92d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0x63f0bd7b8c1d13149efd6b278277dec3fcd52ea9bf0092321b09fda9b6713bfa",
+                    "receiptTrie" : "0xab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23",
+                    "stateRoot" : "0xf8a65f5f9b11f9b5394624f69cc8de7de8ab68b9f31e87bd30a9e1ae7548e365",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063f0bd7b8c1d13149efd6b278277dec3fcd52ea9bf0092321b09fda9b6713bfaa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a06d23c6f6763d61ae864e9bd820abb652528172516ae229cbf61cd60db7ae4f39886d6a32b44afac887f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a092d5f5918ebb1f8765ea007754c062bc72a423c4f8f1cf5925cef72bed5c6f42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a65f5f9b11f9b5394624f69cc8de7de8ab68b9f31e87bd30a9e1ae7548e365a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0ab4afa038ba48d7e5f26cfa623444590b545ac7778d431ede7d05ff54f5c2a23b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a066ae5c563c29c2a68d56222cba4781e5ac6476315584abd261b0d9b8e57f206a88055d6de6e8504b84f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b66e6513a5f2f9fedf4bbfb6af100af330afb43fe0c992db8021e52c8db4e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff2e3b99c98ba6a720dc997caff5ebe7d7b32914221f6eef7c8bc2fd4f650617",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3e93e3efa548f33a2a8849251daa5ab3a39567584f405aa550788d4a76244005",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f53570",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a76143f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json
index d5b96963d..75ffd7d1e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover2_d0g0v0_EIP150" : {
+    "CallEcrecover2_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/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01389a",
-                    "hash" : "0x252240d8d8ddc70260a7fc997f7ad0b66d316ffd341459d77246f8ec3a762985",
-                    "mixHash" : "0x14d7a1cf273002c153561d14aa50d1b7cc09e8a2be44e8ab4454a159e3976918",
-                    "nonce" : "0x4743d12e112ea932",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x6cfa818466af40622f4b707a42cc28988c7f782a0074f4e02ead586c7c40da76",
+                    "mixHash" : "0xc4d1fddf9657ddc76fa9a7951001e073d66038ca7225b4b5458087c5c0f094c4",
+                    "nonce" : "0x87368146ef6363f5",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xb3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7",
-                    "stateRoot" : "0x1047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734ee",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x22bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734eea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a014d7a1cf273002c153561d14aa50d1b7cc09e8a2be44e8ab4454a159e3976918884743d12e112ea932f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0c4d1fddf9657ddc76fa9a7951001e073d66038ca7225b4b5458087c5c0f094c48887368146ef6363f5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x252240d8d8ddc70260a7fc997f7ad0b66d316ffd341459d77246f8ec3a762985",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6cfa818466af40622f4b707a42cc28988c7f782a0074f4e02ead586c7c40da76",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5389a",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76140c6",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_EIP158" : {
+    "CallEcrecover2_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/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x6c5c8cf9e21c535619c2c61fdc631eec4cf3bcfb7c754a57d32868a7fbadb317",
-                    "mixHash" : "0x97debb9af45205507d9441657b8ee8263943f8918fe6b0e781690ffe1ff1077e",
-                    "nonce" : "0x57ccdc5969262c63",
+                    "hash" : "0xdc55eb8b5478a9c19d7ba147e4f2908ade437e2d92be86c29a008a26f891cf89",
+                    "mixHash" : "0x2478aa4b7239bf9a83b4e6c5f4bcbebbd4e33f10475c17bc9319228b31089414",
+                    "nonce" : "0xb70f92f1a53cb7ab",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xc9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3",
-                    "stateRoot" : "0x5570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eb",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x22bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a097debb9af45205507d9441657b8ee8263943f8918fe6b0e781690ffe1ff1077e8857ccdc5969262c63f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a02478aa4b7239bf9a83b4e6c5f4bcbebbd4e33f10475c17bc9319228b3108941488b70f92f1a53cb7abf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c5c8cf9e21c535619c2c61fdc631eec4cf3bcfb7c754a57d32868a7fbadb317",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdc55eb8b5478a9c19d7ba147e4f2908ade437e2d92be86c29a008a26f891cf89",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_Frontier" : {
+    "CallEcrecover2_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/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013570",
-                    "hash" : "0x5df9c26b681ba38bc682609e9bf38fa413c854a0907556a9f0d91992e0cefe47",
-                    "mixHash" : "0xe801f788c99ca06aaaef1bcf7e4a1347a5012f0705616e5b6c7f3b8f06d26b76",
-                    "nonce" : "0x8689c78d5bec90a2",
+                    "gasUsed" : "0x01389a",
+                    "hash" : "0xefa1adb4c086528396d414b2c1c6adc40654ad1ec10738e584ae46d974b2d874",
+                    "mixHash" : "0x384be86da004fab4a5ff1e6d635add200ba806bc867578e17697d4b1b95b53ac",
+                    "nonce" : "0xbf5db3fd3bf0a2fd",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xb9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750",
-                    "stateRoot" : "0xc84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809db",
+                    "receiptTrie" : "0xb3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7",
+                    "stateRoot" : "0x1047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734ee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0e801f788c99ca06aaaef1bcf7e4a1347a5012f0705616e5b6c7f3b8f06d26b76888689c78d5bec90a2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734eea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a0384be86da004fab4a5ff1e6d635add200ba806bc867578e17697d4b1b95b53ac88bf5db3fd3bf0a2fdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5df9c26b681ba38bc682609e9bf38fa413c854a0907556a9f0d91992e0cefe47",
-        "network" : "Frontier",
+        "lastblockhash" : "0xefa1adb4c086528396d414b2c1c6adc40654ad1ec10738e584ae46d974b2d874",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53570",
+                "balance" : "0x4563918244f5389a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76143f0",
+                "balance" : "0x0de0b6b3a76140c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_Homestead" : {
+    "CallEcrecover2_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/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x77a0b1edfb1e758d8732608671dc3145bd8f5310950ca9c23067ac452acda90d",
+                    "mixHash" : "0x6ec93183bce0c09d811b208a85d264c716f355d891899fe219bc1f78e73b068f",
+                    "nonce" : "0xb2806bcf0a57dfc6",
+                    "number" : "0x01",
+                    "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
+                    "receiptTrie" : "0xc9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3",
+                    "stateRoot" : "0x5570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a06ec93183bce0c09d811b208a85d264c716f355d891899fe219bc1f78e73b068f88b2806bcf0a57dfc6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x45d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x77a0b1edfb1e758d8732608671dc3145bd8f5310950ca9c23067ac452acda90d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a246",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013570",
-                    "hash" : "0xce015ede553bb54adf6c6f36a673d95e89201564d073507323aa9df1594921dd",
-                    "mixHash" : "0x312776771675ce40782df6a23ce089cf7b100b42163b2059f9f8808f5124db07",
-                    "nonce" : "0xba2fd8bed27728e9",
+                    "hash" : "0x3ae693e73a41508f5618045bad362e7654c8a60332b06e761946f8a6230db0fd",
+                    "mixHash" : "0x11161237fed5f49307f82582707df8404c11b9f6d5d468a1d6a6312cb3cbf32a",
+                    "nonce" : "0x2a9a87e03a2585c2",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
                     "receiptTrie" : "0xb9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0312776771675ce40782df6a23ce089cf7b100b42163b2059f9f8808f5124db0788ba2fd8bed27728e9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a011161237fed5f49307f82582707df8404c11b9f6d5d468a1d6a6312cb3cbf32a882a9a87e03a2585c2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce015ede553bb54adf6c6f36a673d95e89201564d073507323aa9df1594921dd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3ae693e73a41508f5618045bad362e7654c8a60332b06e761946f8a6230db0fd",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_Metropolis" : {
+    "CallEcrecover2_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/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0xd0e0649a8758b15c7fba05428c6f751cf43b4862c6be909930b8941d468a2d29",
-                    "mixHash" : "0xec2b92c33a5408f845d60ecdf9c6104e35926ea12a8068a16de7d4a6fa48bbf3",
-                    "nonce" : "0xc57098ada3637f4e",
+                    "gasUsed" : "0x013570",
+                    "hash" : "0xd4fb8b227ec8ee6575bcacfa3b6352a00b465e0ae68c6102b97f3aa6b0638374",
+                    "mixHash" : "0xa1b5760611fe4fb32934bbaee65c4941d3f50215c48ea435d9c9751473acf5a8",
+                    "nonce" : "0x6221c7ad4adefe80",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0x22bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915",
+                    "receiptTrie" : "0xb9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750",
+                    "stateRoot" : "0xc84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809db",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0ec2b92c33a5408f845d60ecdf9c6104e35926ea12a8068a16de7d4a6fa48bbf388c57098ada3637f4ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0a1b5760611fe4fb32934bbaee65c4941d3f50215c48ea435d9c9751473acf5a8886221c7ad4adefe80f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0e0649a8758b15c7fba05428c6f751cf43b4862c6be909930b8941d468a2d29",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd4fb8b227ec8ee6575bcacfa3b6352a00b465e0ae68c6102b97f3aa6b0638374",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f53570",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a76143f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover3_d0g0v0.json
index 781ec8a75..6bd5c99f6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover3_d0g0v0_EIP150" : {
+    "CallEcrecover3_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/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017332",
-                    "hash" : "0xce3a8c9ea1c9b300eeffbe65c2dc8cc139fa75fef7d1068a0d475522a9aee5fb",
-                    "mixHash" : "0xb17d088eb332af7877fac515b4e8e6caa6cb01f42e735c45c70b62afaa841f56",
-                    "nonce" : "0x99e3a8e139729d18",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x407d403ab36cb9ae3adace1f8dcf3498941c95426242f08e582bfd2c6175ba95",
+                    "mixHash" : "0x0e73710e7d91042869b942ae696a5a10270a4dc7c6c4f979a2c393b6edc0f5ce",
+                    "nonce" : "0xf9e11d8f9936a5a2",
                     "number" : "0x01",
                     "parentHash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
-                    "receiptTrie" : "0xe925e131a7930f2ff109a9da1ac5bcc6ff14477537dedce4b8c70e509e35350b",
-                    "stateRoot" : "0x957436e90a767b3294f84935b2fe27051de822f3ecaa1bc46a32b4695246e152",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x9300697daa881998eda9c32f2ddf5fbeabdf195e0074f410ce0f09b0bf3c0c84",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0957436e90a767b3294f84935b2fe27051de822f3ecaa1bc46a32b4695246e152a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e925e131a7930f2ff109a9da1ac5bcc6ff14477537dedce4b8c70e509e35350bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173328203e880a0b17d088eb332af7877fac515b4e8e6caa6cb01f42e735c45c70b62afaa841f568899e3a8e139729d18f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09300697daa881998eda9c32f2ddf5fbeabdf195e0074f410ce0f09b0bf3c0c84a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a00e73710e7d91042869b942ae696a5a10270a4dc7c6c4f979a2c393b6edc0f5ce88f9e11d8f9936a5a2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce3a8c9ea1c9b300eeffbe65c2dc8cc139fa75fef7d1068a0d475522a9aee5fb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x407d403ab36cb9ae3adace1f8dcf3498941c95426242f08e582bfd2c6175ba95",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57332",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761062e",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallEcrecover3_d0g0v0_EIP158" : {
+    "CallEcrecover3_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/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0111b2",
-                    "hash" : "0x8f7e2eab948c5efba39c8d2fead5be1230c7cef51510bd1c4b4023ee2d063b05",
-                    "mixHash" : "0x2596676ca8ab22cdbc6fa5da50bcd0d9caa21260ea63fa8b1b0af66601b6caef",
-                    "nonce" : "0xa1575ad03ce4670c",
+                    "hash" : "0xc49f680caf5a9a4dde7a552ef2188288b46525e3e45a213b1e91ef3b4a07e470",
+                    "mixHash" : "0x3d9e5ffd0c4c5d4b69fffa391a8a746870bffa50321adbe381c50c8c9dc5196f",
+                    "nonce" : "0xd24f7f104e05abda",
                     "number" : "0x01",
                     "parentHash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
-                    "receiptTrie" : "0xcc9580b9237fc81f6e30b374ab8555ce7622e647ab4e84260d02b0a19669f156",
-                    "stateRoot" : "0xb0259091b8de64f1fe889679d95d2b53afd14c44e58ceb7474d29bc3193b0a3f",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x9300697daa881998eda9c32f2ddf5fbeabdf195e0074f410ce0f09b0bf3c0c84",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0259091b8de64f1fe889679d95d2b53afd14c44e58ceb7474d29bc3193b0a3fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cc9580b9237fc81f6e30b374ab8555ce7622e647ab4e84260d02b0a19669f156b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a02596676ca8ab22cdbc6fa5da50bcd0d9caa21260ea63fa8b1b0af66601b6caef88a1575ad03ce4670cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09300697daa881998eda9c32f2ddf5fbeabdf195e0074f410ce0f09b0bf3c0c84a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a03d9e5ffd0c4c5d4b69fffa391a8a746870bffa50321adbe381c50c8c9dc5196f88d24f7f104e05abdaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f7e2eab948c5efba39c8d2fead5be1230c7cef51510bd1c4b4023ee2d063b05",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc49f680caf5a9a4dde7a552ef2188288b46525e3e45a213b1e91ef3b4a07e470",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallEcrecover3_d0g0v0_Frontier" : {
+    "CallEcrecover3_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/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017008",
-                    "hash" : "0x405422e27684e533ca50c8fc1e949229b2a80277cfed178a9808e0f66ba7371a",
-                    "mixHash" : "0x6590f0cbb01b6e8d1744ebb0dd1393d47fc22a2bd755d5212fa3a4c49a8a936f",
-                    "nonce" : "0xc0b46b261511b2c4",
+                    "gasUsed" : "0x017332",
+                    "hash" : "0x75ca1fc337a961d61021655350cbacd39211556a04cdd9328fb5d17c9f46056e",
+                    "mixHash" : "0xb70ffb0bc26603d92893d2c52ef3bcd4d945d23ed543b58b6cd59c2273956b4d",
+                    "nonce" : "0x23a9625b0d5a42a1",
                     "number" : "0x01",
                     "parentHash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
-                    "receiptTrie" : "0x69a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963",
-                    "stateRoot" : "0x257259961a61791bb36530e99b41fdcdc0991a506dd0c64824beb2fe0d7ce86e",
+                    "receiptTrie" : "0xe925e131a7930f2ff109a9da1ac5bcc6ff14477537dedce4b8c70e509e35350b",
+                    "stateRoot" : "0x957436e90a767b3294f84935b2fe27051de822f3ecaa1bc46a32b4695246e152",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0257259961a61791bb36530e99b41fdcdc0991a506dd0c64824beb2fe0d7ce86ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba069a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a06590f0cbb01b6e8d1744ebb0dd1393d47fc22a2bd755d5212fa3a4c49a8a936f88c0b46b261511b2c4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0957436e90a767b3294f84935b2fe27051de822f3ecaa1bc46a32b4695246e152a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e925e131a7930f2ff109a9da1ac5bcc6ff14477537dedce4b8c70e509e35350bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173328203e880a0b70ffb0bc26603d92893d2c52ef3bcd4d945d23ed543b58b6cd59c2273956b4d8823a9625b0d5a42a1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x405422e27684e533ca50c8fc1e949229b2a80277cfed178a9808e0f66ba7371a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x75ca1fc337a961d61021655350cbacd39211556a04cdd9328fb5d17c9f46056e",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57008",
+                "balance" : "0x4563918244f57332",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7610958",
+                "balance" : "0x0de0b6b3a761062e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallEcrecover3_d0g0v0_Homestead" : {
+    "CallEcrecover3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x89fa0149ed164fb31dda3a35d92a4a8c01349a164239d751938f1b595afa0521",
+                    "mixHash" : "0x42c05e7f9085c3a921bcac85e5f055433fb4df6559f6032a9ba17b6bca0caa98",
+                    "nonce" : "0x998ec349bc61a59a",
+                    "number" : "0x01",
+                    "parentHash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
+                    "receiptTrie" : "0xcc9580b9237fc81f6e30b374ab8555ce7622e647ab4e84260d02b0a19669f156",
+                    "stateRoot" : "0xb0259091b8de64f1fe889679d95d2b53afd14c44e58ceb7474d29bc3193b0a3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0259091b8de64f1fe889679d95d2b53afd14c44e58ceb7474d29bc3193b0a3fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cc9580b9237fc81f6e30b374ab8555ce7622e647ab4e84260d02b0a19669f156b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a042c05e7f9085c3a921bcac85e5f055433fb4df6559f6032a9ba17b6bca0caa9888998ec349bc61a59af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x89fa0149ed164fb31dda3a35d92a4a8c01349a164239d751938f1b595afa0521",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xe4319f4b631c6d0fcfc84045dbcb676865fe5e13",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f511b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76167ae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover3_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/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017008",
-                    "hash" : "0x1ddee28710da96275613aad51172df0c46cf0167017d9369deff8ee11fe38da2",
-                    "mixHash" : "0xe0c1aa4b05df6ecd729df5b77499be9fa42f5b9f6b28cdcc8d9958c6c2e3065e",
-                    "nonce" : "0xb6ffc55e9a693e23",
+                    "hash" : "0xa1b82b77477b2626bb948ed16603684147200de894ac98d087aa502d0a18d66e",
+                    "mixHash" : "0xe817111f94953d781f0b3932a22ac33fe5749df37bdf627463ae76f9b4f5fff3",
+                    "nonce" : "0x04d6935035449355",
                     "number" : "0x01",
                     "parentHash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
                     "receiptTrie" : "0x69a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0257259961a61791bb36530e99b41fdcdc0991a506dd0c64824beb2fe0d7ce86ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba069a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a0e0c1aa4b05df6ecd729df5b77499be9fa42f5b9f6b28cdcc8d9958c6c2e3065e88b6ffc55e9a693e23f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0257259961a61791bb36530e99b41fdcdc0991a506dd0c64824beb2fe0d7ce86ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba069a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a0e817111f94953d781f0b3932a22ac33fe5749df37bdf627463ae76f9b4f5fff38804d6935035449355f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ddee28710da96275613aad51172df0c46cf0167017d9369deff8ee11fe38da2",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa1b82b77477b2626bb948ed16603684147200de894ac98d087aa502d0a18d66e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallEcrecover3_d0g0v0_Metropolis" : {
+    "CallEcrecover3_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/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0111b2",
-                    "hash" : "0x21a95354c7ffb1b36ebfa0381e22bbddcc6a4019ed36debded8121cc71af7f34",
-                    "mixHash" : "0xce0fbfaec52458ac00ea0d559af51c5a07c04cdc48b8f336e3b2ce58bd7512e3",
-                    "nonce" : "0x337a9b2454c93aaa",
+                    "gasUsed" : "0x017008",
+                    "hash" : "0xaf7f192e0ed082b9cae536bb88885cb56d0077020e0d43ff6b80b6f057856e30",
+                    "mixHash" : "0x94c6c6df709f300ca13007cbebf9ecec50042ef7df3271c4683a8bcb1aadd969",
+                    "nonce" : "0x89f133a48ed9614c",
                     "number" : "0x01",
                     "parentHash" : "0x20db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537",
-                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
-                    "stateRoot" : "0x9300697daa881998eda9c32f2ddf5fbeabdf195e0074f410ce0f09b0bf3c0c84",
+                    "receiptTrie" : "0x69a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963",
+                    "stateRoot" : "0x257259961a61791bb36530e99b41fdcdc0991a506dd0c64824beb2fe0d7ce86e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09300697daa881998eda9c32f2ddf5fbeabdf195e0074f410ce0f09b0bf3c0c84a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0ce0fbfaec52458ac00ea0d559af51c5a07c04cdc48b8f336e3b2ce58bd7512e388337a9b2454c93aaaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a020db49fd24e4f2ae3072310aa8e37c7ed313046cf8c5e80fcf6b9e50806a5537a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0257259961a61791bb36530e99b41fdcdc0991a506dd0c64824beb2fe0d7ce86ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba069a08d7b66f49d706aa4ff104ce250be7ed0a72622d8ed756dcd995aed412963b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a094c6c6df709f300ca13007cbebf9ecec50042ef7df3271c4683a8bcb1aadd9698889f133a48ed9614cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad665e4817615182b405f7fa6d873848c604701bb532c81eea6497abccbbe9d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21a95354c7ffb1b36ebfa0381e22bbddcc6a4019ed36debded8121cc71af7f34",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xaf7f192e0ed082b9cae536bb88885cb56d0077020e0d43ff6b80b6f057856e30",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f511b2",
+                "balance" : "0x4563918244f57008",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167ae",
+                "balance" : "0x0de0b6b3a7610958",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover80_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover80_d0g0v0.json
index f20874b39..124f64713 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover80_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover80_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover80_d0g0v0_EIP150" : {
+    "CallEcrecover80_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/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01389a",
-                    "hash" : "0xb27edb6fa9b4ecc679b6b3a3e9a36b9a142af0e0e16a52450b35079f7a72d9b6",
-                    "mixHash" : "0x473ca6db7acd22fd78973efb43aa7f4cbc58f8ca77fbe106dd013240e750f773",
-                    "nonce" : "0xfde82f943d4cee4f",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x3f59ec5a9cff09a184e712f136dfd41f5c4f039727124714c56529c33414aa87",
+                    "mixHash" : "0x1ad8c3e81498240aa54ba0ab0a7cebc0a63c8ae965cc90964dcd26030926bb8c",
+                    "nonce" : "0x763a2aeac9dfb540",
                     "number" : "0x01",
                     "parentHash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
-                    "receiptTrie" : "0xd4b81d690586836f02e17b933bc2d10ca99bc9021feb7a65547dc12ed91ef1af",
-                    "stateRoot" : "0xb6017970cf530e1f33b641a3be84d3488cab05fd039ea4d1981958005cb377e2",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x588a870191af39c51d36089730a6155d652f02b4453d374e060f70a7f854457b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6017970cf530e1f33b641a3be84d3488cab05fd039ea4d1981958005cb377e2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0d4b81d690586836f02e17b933bc2d10ca99bc9021feb7a65547dc12ed91ef1afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a0473ca6db7acd22fd78973efb43aa7f4cbc58f8ca77fbe106dd013240e750f77388fde82f943d4cee4ff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0588a870191af39c51d36089730a6155d652f02b4453d374e060f70a7f854457ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a01ad8c3e81498240aa54ba0ab0a7cebc0a63c8ae965cc90964dcd26030926bb8c88763a2aeac9dfb540f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb27edb6fa9b4ecc679b6b3a3e9a36b9a142af0e0e16a52450b35079f7a72d9b6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3f59ec5a9cff09a184e712f136dfd41f5c4f039727124714c56529c33414aa87",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5389a",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76140c6",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallEcrecover80_d0g0v0_EIP158" : {
+    "CallEcrecover80_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/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x36487a17572fd410eba0475fa317f8a3185b6d0174641552c49b522e57ec2980",
-                    "mixHash" : "0x63cd194124f6459d894d3062c7d0eef3f5d0dafe882a17e33ad8702d2f9a4233",
-                    "nonce" : "0xf08ae95b893798ce",
+                    "hash" : "0x5bb986b7516e3dee68efbbc02c5cf7cc46f1278eae4b23ef98046edac7b1c69a",
+                    "mixHash" : "0x118c6ed316728659641635ad4ba81e17ccf8ae942caa7a4d4414442f0a6c1d28",
+                    "nonce" : "0x1e007c13c4eac354",
                     "number" : "0x01",
                     "parentHash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
-                    "receiptTrie" : "0x8e9e6532f7e3b4dc91a5560c5aca38c8fd1990ccac0d46bc6da5381a812d1557",
-                    "stateRoot" : "0x22300ab8c37874f9ea2acde74b20dd04032d2d13c7dbf078579778c8aa2a6da4",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x588a870191af39c51d36089730a6155d652f02b4453d374e060f70a7f854457b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022300ab8c37874f9ea2acde74b20dd04032d2d13c7dbf078579778c8aa2a6da4a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08e9e6532f7e3b4dc91a5560c5aca38c8fd1990ccac0d46bc6da5381a812d1557b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a063cd194124f6459d894d3062c7d0eef3f5d0dafe882a17e33ad8702d2f9a423388f08ae95b893798cef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0588a870191af39c51d36089730a6155d652f02b4453d374e060f70a7f854457ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0118c6ed316728659641635ad4ba81e17ccf8ae942caa7a4d4414442f0a6c1d28881e007c13c4eac354f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36487a17572fd410eba0475fa317f8a3185b6d0174641552c49b522e57ec2980",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5bb986b7516e3dee68efbbc02c5cf7cc46f1278eae4b23ef98046edac7b1c69a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallEcrecover80_d0g0v0_Frontier" : {
+    "CallEcrecover80_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/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013570",
-                    "hash" : "0x811b9caad9d921c449b1c6cb458ec4c2e405a516aef4533ba73406e14cc16a05",
-                    "mixHash" : "0xe968f71f537b1c344205fc36215921451d05549debc35fc8c4f3b6aaef3f2f3e",
-                    "nonce" : "0xec74e2dfe14713fe",
+                    "gasUsed" : "0x01389a",
+                    "hash" : "0x01e26642553771b06c81bdbdd77f1a3de21f118b038a79034e68be3a51eb74db",
+                    "mixHash" : "0xf3aa247c61b3a043ddee9cb109761b6d2cd5718fe3560b5f74bf3d06f4f0ecf1",
+                    "nonce" : "0x943a8581db2adeb0",
                     "number" : "0x01",
                     "parentHash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
-                    "receiptTrie" : "0x4366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11",
-                    "stateRoot" : "0xd4ac76f03d723579facf35b7ab9240f709bbece48e80b7f3a3e9f79f6497074f",
+                    "receiptTrie" : "0xd4b81d690586836f02e17b933bc2d10ca99bc9021feb7a65547dc12ed91ef1af",
+                    "stateRoot" : "0xb6017970cf530e1f33b641a3be84d3488cab05fd039ea4d1981958005cb377e2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ac76f03d723579facf35b7ab9240f709bbece48e80b7f3a3e9f79f6497074fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a04366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0e968f71f537b1c344205fc36215921451d05549debc35fc8c4f3b6aaef3f2f3e88ec74e2dfe14713fef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6017970cf530e1f33b641a3be84d3488cab05fd039ea4d1981958005cb377e2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0d4b81d690586836f02e17b933bc2d10ca99bc9021feb7a65547dc12ed91ef1afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a0f3aa247c61b3a043ddee9cb109761b6d2cd5718fe3560b5f74bf3d06f4f0ecf188943a8581db2adeb0f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x811b9caad9d921c449b1c6cb458ec4c2e405a516aef4533ba73406e14cc16a05",
-        "network" : "Frontier",
+        "lastblockhash" : "0x01e26642553771b06c81bdbdd77f1a3de21f118b038a79034e68be3a51eb74db",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53570",
+                "balance" : "0x4563918244f5389a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76143f0",
+                "balance" : "0x0de0b6b3a76140c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallEcrecover80_d0g0v0_Homestead" : {
+    "CallEcrecover80_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/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x01acd316c4f727b629c187abc89776ea5865f6cae344da328bce89b0783ac26c",
+                    "mixHash" : "0x923a2d4b972b69159f275cede21e9fda7366257e460ea3974d95a26f03107cfb",
+                    "nonce" : "0xabde7f7873daacb8",
+                    "number" : "0x01",
+                    "parentHash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
+                    "receiptTrie" : "0x8e9e6532f7e3b4dc91a5560c5aca38c8fd1990ccac0d46bc6da5381a812d1557",
+                    "stateRoot" : "0x22300ab8c37874f9ea2acde74b20dd04032d2d13c7dbf078579778c8aa2a6da4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022300ab8c37874f9ea2acde74b20dd04032d2d13c7dbf078579778c8aa2a6da4a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08e9e6532f7e3b4dc91a5560c5aca38c8fd1990ccac0d46bc6da5381a812d1557b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0923a2d4b972b69159f275cede21e9fda7366257e460ea3974d95a26f03107cfb88abde7f7873daacb8f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x01acd316c4f727b629c187abc89776ea5865f6cae344da328bce89b0783ac26c",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a246",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover80_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013570",
-                    "hash" : "0xb2416fef6b81ec160b5a99777c4aa0aa7bf0c061a03a164c2b2ba26d6a779d95",
-                    "mixHash" : "0x907f842f1f1efafec175083b7096018c588414e63409cf99defa4b3b0ac2073d",
-                    "nonce" : "0xb7d846602b5160d3",
+                    "hash" : "0xa8c9a672e7d01c47be726d2e75b4f55605e75880e0a2f99d62f6ddf9fddb43ed",
+                    "mixHash" : "0x1a7718dc34d04b31fb25b01f78379dc4937fb9d167f2be3cc313374114742b98",
+                    "nonce" : "0x793191d16290ed43",
                     "number" : "0x01",
                     "parentHash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
                     "receiptTrie" : "0x4366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ac76f03d723579facf35b7ab9240f709bbece48e80b7f3a3e9f79f6497074fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a04366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0907f842f1f1efafec175083b7096018c588414e63409cf99defa4b3b0ac2073d88b7d846602b5160d3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ac76f03d723579facf35b7ab9240f709bbece48e80b7f3a3e9f79f6497074fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a04366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a01a7718dc34d04b31fb25b01f78379dc4937fb9d167f2be3cc313374114742b9888793191d16290ed43f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2416fef6b81ec160b5a99777c4aa0aa7bf0c061a03a164c2b2ba26d6a779d95",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa8c9a672e7d01c47be726d2e75b4f55605e75880e0a2f99d62f6ddf9fddb43ed",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallEcrecover80_d0g0v0_Metropolis" : {
+    "CallEcrecover80_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/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0x400c4556fd8acf2fddb2c6d0c9b8f66e450b25c283f1ade1c261f8ef8182d340",
-                    "mixHash" : "0x206341a8efc8c06067643c0c94e6c00215da671183620af1a84329d920edd39d",
-                    "nonce" : "0x895ed5555f576434",
+                    "gasUsed" : "0x013570",
+                    "hash" : "0x243ae62a2052f2ed9074758dbdf442705a2922ab4686699f443f91786c559ebc",
+                    "mixHash" : "0x5e5f9a9a9e9ca738dd4a59b33dce16fc3e5b10f9e1f1d96778ad616ec39b3d70",
+                    "nonce" : "0x39c54302001cf6ab",
                     "number" : "0x01",
                     "parentHash" : "0x0420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0x588a870191af39c51d36089730a6155d652f02b4453d374e060f70a7f854457b",
+                    "receiptTrie" : "0x4366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11",
+                    "stateRoot" : "0xd4ac76f03d723579facf35b7ab9240f709bbece48e80b7f3a3e9f79f6497074f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0588a870191af39c51d36089730a6155d652f02b4453d374e060f70a7f854457ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0206341a8efc8c06067643c0c94e6c00215da671183620af1a84329d920edd39d88895ed5555f576434f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a00420cd5afb59bf7a18735c27c2c6ed45903f0acdf5cdaf3e6cfdd0e617dc3fd3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ac76f03d723579facf35b7ab9240f709bbece48e80b7f3a3e9f79f6497074fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a04366e0dc5acdeee0f9206634f46393f6fe8205a4afae82faa54a34d451cfdb11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a05e5f9a9a9e9ca738dd4a59b33dce16fc3e5b10f9e1f1d96778ad616ec39b3d708839c54302001cf6abf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e8aaa4982d5f7d4d6f58fb6437390b2d159c870cb6905d5c7364688a5e69012a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x400c4556fd8acf2fddb2c6d0c9b8f66e450b25c283f1ade1c261f8ef8182d340",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x243ae62a2052f2ed9074758dbdf442705a2922ab4686699f443f91786c559ebc",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f53570",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a76143f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0.json
index 3f7efc850..df6328d3f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecoverCheckLengthWrongV_d0g0v0_EIP150" : {
+    "CallEcrecoverCheckLengthWrongV_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/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ace6",
-                    "hash" : "0x3f4806f673aa18eb1a88d2720878762ac880317d0751afe28296ab538c115b8a",
-                    "mixHash" : "0xbc76c42d4b6b7b7939a374c7877de448685a682738732000419553a067a883ac",
-                    "nonce" : "0x85ad77da8dfa8d20",
+                    "gasUsed" : "0x014b3e",
+                    "hash" : "0x3fef8ec1d292e5819d4ba4f13b2ed154b2d80c6f11360a4516de6a4ea1b532bb",
+                    "mixHash" : "0x07e2068db524228c733a86bef46ae30977d288fbb59fcfd8b7f23159da96c0fb",
+                    "nonce" : "0x0f513644a3c37c3e",
                     "number" : "0x01",
                     "parentHash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
-                    "receiptTrie" : "0xa14e506f0be4410b8f5529fdaa95a7f73421ce12bce6c6b0ae308cbcec7bcaee",
-                    "stateRoot" : "0x80bf97efd5f22fe2c2e56534f28ac540c1555965b97459aca5fb5816df1bb207",
+                    "receiptTrie" : "0x132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54",
+                    "stateRoot" : "0x90a9e3df309b6e4431cad7815f0c60838597c5bf7770bd7bfb38ae4bff18ebd1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080bf97efd5f22fe2c2e56534f28ac540c1555965b97459aca5fb5816df1bb207a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0a14e506f0be4410b8f5529fdaa95a7f73421ce12bce6c6b0ae308cbcec7bcaeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ace68203e880a0bc76c42d4b6b7b7939a374c7877de448685a682738732000419553a067a883ac8885ad77da8dfa8d20f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a9e3df309b6e4431cad7815f0c60838597c5bf7770bd7bfb38ae4bff18ebd1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a007e2068db524228c733a86bef46ae30977d288fbb59fcfd8b7f23159da96c0fb880f513644a3c37c3ef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f4806f673aa18eb1a88d2720878762ac880317d0751afe28296ab538c115b8a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3fef8ec1d292e5819d4ba4f13b2ed154b2d80c6f11360a4516de6a4ea1b532bb",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -83,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ace6",
+                "balance" : "0x4563918244f54b3e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cc7a",
+                "balance" : "0x0de0b6b3a7612e22",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -114,10 +114,10 @@
             }
         }
     },
-    "CallEcrecoverCheckLengthWrongV_d0g0v0_EIP158" : {
+    "CallEcrecoverCheckLengthWrongV_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/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014b3e",
-                    "hash" : "0xa7dbf79419431ef83488ef8d8d6c069ba5b41cb2caad9ec5b7dc4af4b4414c9a",
-                    "mixHash" : "0xf55b6ccf133a2a6fc17f290ed6f421e85b97747338a36ed864ee419a65f18c7a",
-                    "nonce" : "0x3dd1247368562a68",
+                    "hash" : "0x00f3ca3d45e4624e944cbf1faeca5cf1921366c88ac7d5eb71e685f7bdb499b8",
+                    "mixHash" : "0x50fde0788f9120fdbcf797f68416d9b399a32f7f54aa6dfe5e0cc8cd8073e002",
+                    "nonce" : "0xb52894dc936e3b5d",
                     "number" : "0x01",
                     "parentHash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
-                    "receiptTrie" : "0x617a9a9fb7020a9f3b5f03bfe30b4d83b802699dc62e8d2af8761383f4f63cbb",
-                    "stateRoot" : "0x00f8f4c18fdecdf890706ca91f949e6c7b6f1808783c5142825d9be0690a46aa",
+                    "receiptTrie" : "0x132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54",
+                    "stateRoot" : "0x90a9e3df309b6e4431cad7815f0c60838597c5bf7770bd7bfb38ae4bff18ebd1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000f8f4c18fdecdf890706ca91f949e6c7b6f1808783c5142825d9be0690a46aaa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0617a9a9fb7020a9f3b5f03bfe30b4d83b802699dc62e8d2af8761383f4f63cbbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0f55b6ccf133a2a6fc17f290ed6f421e85b97747338a36ed864ee419a65f18c7a883dd1247368562a68f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a9e3df309b6e4431cad7815f0c60838597c5bf7770bd7bfb38ae4bff18ebd1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a050fde0788f9120fdbcf797f68416d9b399a32f7f54aa6dfe5e0cc8cd8073e00288b52894dc936e3b5df865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -177,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7dbf79419431ef83488ef8d8d6c069ba5b41cb2caad9ec5b7dc4af4b4414c9a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x00f3ca3d45e4624e944cbf1faeca5cf1921366c88ac7d5eb71e685f7bdb499b8",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601d6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
@@ -222,10 +229,10 @@
             }
         }
     },
-    "CallEcrecoverCheckLengthWrongV_d0g0v0_Frontier" : {
+    "CallEcrecoverCheckLengthWrongV_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/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01aa52",
-                    "hash" : "0x0cb6422dd1a9020450b6697af44481ac438026fed6a3a360cff1498b38178688",
-                    "mixHash" : "0x432cfb720692dfd2ca8f6121a2f52dacc34a9327036ea882df198a4e461028e7",
-                    "nonce" : "0xf4e7a17b336b247c",
+                    "gasUsed" : "0x01ace6",
+                    "hash" : "0xba5997a0713f3f4605f1ea11d9b354c0253f65663d346a0bef8bd336c8bfb022",
+                    "mixHash" : "0xe0a0f36c61291d16917d3ceecd9fef526a1a7c707102f02e5ad23daad5e1c33c",
+                    "nonce" : "0x4ded44c00cdbc53f",
                     "number" : "0x01",
                     "parentHash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
-                    "receiptTrie" : "0xc88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218a",
-                    "stateRoot" : "0xe3a9f6ada69c2161a0660c0b9c798321cc44608d3e6034d7ba662c6a259f6778",
+                    "receiptTrie" : "0xa14e506f0be4410b8f5529fdaa95a7f73421ce12bce6c6b0ae308cbcec7bcaee",
+                    "stateRoot" : "0x80bf97efd5f22fe2c2e56534f28ac540c1555965b97459aca5fb5816df1bb207",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3a9f6ada69c2161a0660c0b9c798321cc44608d3e6034d7ba662c6a259f6778a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a0432cfb720692dfd2ca8f6121a2f52dacc34a9327036ea882df198a4e461028e788f4e7a17b336b247cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080bf97efd5f22fe2c2e56534f28ac540c1555965b97459aca5fb5816df1bb207a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0a14e506f0be4410b8f5529fdaa95a7f73421ce12bce6c6b0ae308cbcec7bcaeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ace68203e880a0e0a0f36c61291d16917d3ceecd9fef526a1a7c707102f02e5ad23daad5e1c33c884ded44c00cdbc53ff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -285,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0cb6422dd1a9020450b6697af44481ac438026fed6a3a360cff1498b38178688",
-        "network" : "Frontier",
+        "lastblockhash" : "0xba5997a0713f3f4605f1ea11d9b354c0253f65663d346a0bef8bd336c8bfb022",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -306,14 +313,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5aa52",
+                "balance" : "0x4563918244f5ace6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cf0e",
+                "balance" : "0x0de0b6b3a760cc7a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,10 +344,118 @@
             }
         }
     },
-    "CallEcrecoverCheckLengthWrongV_d0g0v0_Homestead" : {
+    "CallEcrecoverCheckLengthWrongV_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/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x014b3e",
+                    "hash" : "0x9ef245c91b9217f7b479d2c20c8ae2641407d40260a632c6ec98a64612931f58",
+                    "mixHash" : "0x159dffcacf7cadb3d86bbdc7a9feecb9f3a86344a675f3cb0dbcc3cbbc309f78",
+                    "nonce" : "0x8cf2168c144e6e0a",
+                    "number" : "0x01",
+                    "parentHash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
+                    "receiptTrie" : "0x617a9a9fb7020a9f3b5f03bfe30b4d83b802699dc62e8d2af8761383f4f63cbb",
+                    "stateRoot" : "0x00f8f4c18fdecdf890706ca91f949e6c7b6f1808783c5142825d9be0690a46aa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000f8f4c18fdecdf890706ca91f949e6c7b6f1808783c5142825d9be0690a46aaa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0617a9a9fb7020a9f3b5f03bfe30b4d83b802699dc62e8d2af8761383f4f63cbbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0159dffcacf7cadb3d86bbdc7a9feecb9f3a86344a675f3cb0dbcc3cbbc309f78888cf2168c144e6e0af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x97cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9ef245c91b9217f7b479d2c20c8ae2641407d40260a632c6ec98a64612931f58",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601d6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x1122334455667788990011223344556677889900112233445566778899001122",
+                    "0x01" : "0xa0",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f54b3e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7612e22",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601d6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecoverCheckLengthWrongV_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +467,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01aa52",
-                    "hash" : "0x6854c639f8797bf847cb0d2542b52f4b6c3c8486e65414b20d1e82bd0421a9d5",
-                    "mixHash" : "0xd065fbd90017c9ddef7774f89c28e9c2f69142991e9e7ca8ba50f27a41488b4d",
-                    "nonce" : "0x9a68cbd1f6cb04f1",
+                    "hash" : "0xbb10bc6e699a9dae09cab544d2581f959afe0e868943c68cfc52083991bc5578",
+                    "mixHash" : "0xaa85af610ba277ec5339580958f57a2512f5cdae6f87fdf1924190117ad9dc43",
+                    "nonce" : "0xe3f4316bcc4d91dd",
                     "number" : "0x01",
                     "parentHash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
                     "receiptTrie" : "0xc88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218a",
@@ -363,7 +478,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3a9f6ada69c2161a0660c0b9c798321cc44608d3e6034d7ba662c6a259f6778a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a0d065fbd90017c9ddef7774f89c28e9c2f69142991e9e7ca8ba50f27a41488b4d889a68cbd1f6cb04f1f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3a9f6ada69c2161a0660c0b9c798321cc44608d3e6034d7ba662c6a259f6778a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a0aa85af610ba277ec5339580958f57a2512f5cdae6f87fdf1924190117ad9dc4388e3f4316bcc4d91ddf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,8 +515,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6854c639f8797bf847cb0d2542b52f4b6c3c8486e65414b20d1e82bd0421a9d5",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbb10bc6e699a9dae09cab544d2581f959afe0e868943c68cfc52083991bc5578",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -452,10 +567,10 @@
             }
         }
     },
-    "CallEcrecoverCheckLengthWrongV_d0g0v0_Metropolis" : {
+    "CallEcrecoverCheckLengthWrongV_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/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,19 +581,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014b3e",
-                    "hash" : "0x233075cfe92b204d303a8c9bfe29f61fcd5ce9916308e9ffd5654c5076e88ac9",
-                    "mixHash" : "0xd91ce17751c834c25f6135253058d1cf8f2f03962e0c9f3f9488528232bdfa04",
-                    "nonce" : "0x703daea99f556333",
+                    "gasUsed" : "0x01aa52",
+                    "hash" : "0x351f2488fab13deebba62371ca9a3a3182360c1d82016e94fceaae7d6e5657a5",
+                    "mixHash" : "0x4a548400cc94b984169695a8a0cae24211a08da847c4e4c1952ec28da12e1880",
+                    "nonce" : "0x3eaf839db3f1ea01",
                     "number" : "0x01",
                     "parentHash" : "0xf0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cc",
-                    "receiptTrie" : "0x132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54",
-                    "stateRoot" : "0x90a9e3df309b6e4431cad7815f0c60838597c5bf7770bd7bfb38ae4bff18ebd1",
+                    "receiptTrie" : "0xc88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218a",
+                    "stateRoot" : "0xe3a9f6ada69c2161a0660c0b9c798321cc44608d3e6034d7ba662c6a259f6778",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a9e3df309b6e4431cad7815f0c60838597c5bf7770bd7bfb38ae4bff18ebd1a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0d91ce17751c834c25f6135253058d1cf8f2f03962e0c9f3f9488528232bdfa0488703daea99f556333f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f0167cb0e746dcc02d64172c559703e5fb730f9acc018fee1b5b0ca6b630b7cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3a9f6ada69c2161a0660c0b9c798321cc44608d3e6034d7ba662c6a259f6778a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0c88b1d5790df639709c6790c8d43817b461118bc5537079f22488881946d218ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a04a548400cc94b984169695a8a0cae24211a08da847c4e4c1952ec28da12e1880883eaf839db3f1ea01f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -515,10 +630,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097cfd663abf93b3dba3920ab6e04510ca186a3c49116dbe7806d317fe5e288a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x233075cfe92b204d303a8c9bfe29f61fcd5ce9916308e9ffd5654c5076e88ac9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x351f2488fab13deebba62371ca9a3a3182360c1d82016e94fceaae7d6e5657a5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -536,14 +651,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54b3e",
+                "balance" : "0x4563918244f5aa52",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612e22",
+                "balance" : "0x0de0b6b3a760cf0e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0.json
index 11df266a9..17e180518 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecoverCheckLength_d0g0v0_EIP150" : {
+    "CallEcrecoverCheckLength_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/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ace6",
-                    "hash" : "0xc06cf3da6fcb0db7cf19baa9aef067ff9cc66c61940c87c10d7336ec2e0ff1bc",
-                    "mixHash" : "0xe35dd5e34281b0d7871d3d4c190a5842b689bc8c89f981a4a64112e95a45daff",
-                    "nonce" : "0x0a98c2f22e9400e0",
+                    "gasUsed" : "0x014b3e",
+                    "hash" : "0x34daf82e2ad3289e6bd272bfa6a4a6da08a75a3ee36f4673fb3efdf54f13fed3",
+                    "mixHash" : "0x379988d3ecbc5116851258c46599dee3e1f6666a20bddb35e11a68047c616583",
+                    "nonce" : "0x05e3da4f7767d4b5",
                     "number" : "0x01",
                     "parentHash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
-                    "receiptTrie" : "0xaa47403e088be2e6927768b09174c1636e78413841ea4786f9eec6214e712d6c",
-                    "stateRoot" : "0x7e0a67418e8ed90309a9fc4c1125cac5673164dcf99fbda712c5378e7e342dca",
+                    "receiptTrie" : "0x132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54",
+                    "stateRoot" : "0x978ee4002e008242b3726ad6bbd007704c17226c5c6c027eff9d25e1bf58a181",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e0a67418e8ed90309a9fc4c1125cac5673164dcf99fbda712c5378e7e342dcaa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0aa47403e088be2e6927768b09174c1636e78413841ea4786f9eec6214e712d6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ace68203e880a0e35dd5e34281b0d7871d3d4c190a5842b689bc8c89f981a4a64112e95a45daff880a98c2f22e9400e0f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0978ee4002e008242b3726ad6bbd007704c17226c5c6c027eff9d25e1bf58a181a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0379988d3ecbc5116851258c46599dee3e1f6666a20bddb35e11a68047c6165838805e3da4f7767d4b5f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc06cf3da6fcb0db7cf19baa9aef067ff9cc66c61940c87c10d7336ec2e0ff1bc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x34daf82e2ad3289e6bd272bfa6a4a6da08a75a3ee36f4673fb3efdf54f13fed3",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -83,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ace6",
+                "balance" : "0x4563918244f54b3e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cc7a",
+                "balance" : "0x0de0b6b3a7612e22",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -114,10 +114,10 @@
             }
         }
     },
-    "CallEcrecoverCheckLength_d0g0v0_EIP158" : {
+    "CallEcrecoverCheckLength_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/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014b3e",
-                    "hash" : "0x83b26114bdc7526ebc47381f63aee8c31a4c552084f91b5711523463de40695f",
-                    "mixHash" : "0xdc0aeaeb44a70322e18149c106036776acbfc87caee333d40ee7dc7244b6e83f",
-                    "nonce" : "0xa946b11ced3e8386",
+                    "hash" : "0x33a4985ebc9bbecd16f3e148380d40ed181d4a5e49737388292fa48d4fc1bbd1",
+                    "mixHash" : "0xe6bbe1c4b93decab817f223c0449acde6a61b9fa5d6730a6902b203174f63892",
+                    "nonce" : "0xa6b766dcf1a4e5b8",
                     "number" : "0x01",
                     "parentHash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
-                    "receiptTrie" : "0x4c624e5e694df22dfbeb54c55391af3bd125504f6676e835945ad3cbac44efbe",
-                    "stateRoot" : "0x314f072be04779007c69652b9fb2facc1c87d26881892c65dbb7f025f9de2ffa",
+                    "receiptTrie" : "0x132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54",
+                    "stateRoot" : "0x978ee4002e008242b3726ad6bbd007704c17226c5c6c027eff9d25e1bf58a181",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0314f072be04779007c69652b9fb2facc1c87d26881892c65dbb7f025f9de2ffaa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a04c624e5e694df22dfbeb54c55391af3bd125504f6676e835945ad3cbac44efbeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0dc0aeaeb44a70322e18149c106036776acbfc87caee333d40ee7dc7244b6e83f88a946b11ced3e8386f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0978ee4002e008242b3726ad6bbd007704c17226c5c6c027eff9d25e1bf58a181a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0e6bbe1c4b93decab817f223c0449acde6a61b9fa5d6730a6902b203174f6389288a6b766dcf1a4e5b8f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -177,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83b26114bdc7526ebc47381f63aee8c31a4c552084f91b5711523463de40695f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x33a4985ebc9bbecd16f3e148380d40ed181d4a5e49737388292fa48d4fc1bbd1",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
@@ -222,10 +229,10 @@
             }
         }
     },
-    "CallEcrecoverCheckLength_d0g0v0_Frontier" : {
+    "CallEcrecoverCheckLength_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/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01aa52",
-                    "hash" : "0xae01e70277b61a45e2e4cbca1cc908373629f1ad48ab83e8ceecf41f55b4476e",
-                    "mixHash" : "0x63fdb6c1a2a8fe564ac92a40ff2fd2461634180b01f1e2bac7bcc7ece92e7230",
-                    "nonce" : "0xa572b01c304fcdbf",
+                    "gasUsed" : "0x01ace6",
+                    "hash" : "0x90b8ffc79bae55340c249abad1f619ab322e6d5e1100f75654037845049fcdf5",
+                    "mixHash" : "0xc0351fc6987373a7a70cd427c777f4c53833049eeb576769894f38213e3d16de",
+                    "nonce" : "0x3862918f6af3c2ff",
                     "number" : "0x01",
                     "parentHash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
-                    "receiptTrie" : "0xf6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576",
-                    "stateRoot" : "0xef11fc6385cc5c475fa644724e94d9232b0bd0af2f2984248a757ce249a9ce4a",
+                    "receiptTrie" : "0xaa47403e088be2e6927768b09174c1636e78413841ea4786f9eec6214e712d6c",
+                    "stateRoot" : "0x7e0a67418e8ed90309a9fc4c1125cac5673164dcf99fbda712c5378e7e342dca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef11fc6385cc5c475fa644724e94d9232b0bd0af2f2984248a757ce249a9ce4aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a063fdb6c1a2a8fe564ac92a40ff2fd2461634180b01f1e2bac7bcc7ece92e723088a572b01c304fcdbff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e0a67418e8ed90309a9fc4c1125cac5673164dcf99fbda712c5378e7e342dcaa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0aa47403e088be2e6927768b09174c1636e78413841ea4786f9eec6214e712d6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ace68203e880a0c0351fc6987373a7a70cd427c777f4c53833049eeb576769894f38213e3d16de883862918f6af3c2fff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -285,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae01e70277b61a45e2e4cbca1cc908373629f1ad48ab83e8ceecf41f55b4476e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x90b8ffc79bae55340c249abad1f619ab322e6d5e1100f75654037845049fcdf5",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -306,14 +313,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5aa52",
+                "balance" : "0x4563918244f5ace6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cf0e",
+                "balance" : "0x0de0b6b3a760cc7a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,10 +344,118 @@
             }
         }
     },
-    "CallEcrecoverCheckLength_d0g0v0_Homestead" : {
+    "CallEcrecoverCheckLength_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/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x014b3e",
+                    "hash" : "0xfedf30485ace0813e267eb877305ed36a3da448f494fc39cd3dea85c6b458cd8",
+                    "mixHash" : "0xce2b0fad1facf0ce3e0476b8363664202340d61b99e5fb689862f078ce318b83",
+                    "nonce" : "0x4770ec7dbb771eac",
+                    "number" : "0x01",
+                    "parentHash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
+                    "receiptTrie" : "0x4c624e5e694df22dfbeb54c55391af3bd125504f6676e835945ad3cbac44efbe",
+                    "stateRoot" : "0x314f072be04779007c69652b9fb2facc1c87d26881892c65dbb7f025f9de2ffa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0314f072be04779007c69652b9fb2facc1c87d26881892c65dbb7f025f9de2ffaa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a04c624e5e694df22dfbeb54c55391af3bd125504f6676e835945ad3cbac44efbeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0ce2b0fad1facf0ce3e0476b8363664202340d61b99e5fb689862f078ce318b83884770ec7dbb771eacf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfedf30485ace0813e267eb877305ed36a3da448f494fc39cd3dea85c6b458cd8",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0xa0",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f54b3e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7612e22",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecoverCheckLength_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +467,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01aa52",
-                    "hash" : "0xd59048ad1ce2766a5eb85d0899eb2cfc5b1231553dfb2a1b7712ecc99982b314",
-                    "mixHash" : "0xaf6bedcc558bba01726b57e3bd6fd4c48200410c834191ade79c433b5f9a5aa8",
-                    "nonce" : "0x3942500b7603feeb",
+                    "hash" : "0x87a7ee764832767a3ee71463240e4f601474630aad7502eaf3d6b77be1585574",
+                    "mixHash" : "0x7f5b5caf78f807f61e601b5fa25e23386409848ce8bfe237b9facdee7e7993bc",
+                    "nonce" : "0xa1c5cf8f3bfee2d6",
                     "number" : "0x01",
                     "parentHash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
                     "receiptTrie" : "0xf6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576",
@@ -363,7 +478,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef11fc6385cc5c475fa644724e94d9232b0bd0af2f2984248a757ce249a9ce4aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a0af6bedcc558bba01726b57e3bd6fd4c48200410c834191ade79c433b5f9a5aa8883942500b7603feebf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef11fc6385cc5c475fa644724e94d9232b0bd0af2f2984248a757ce249a9ce4aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a07f5b5caf78f807f61e601b5fa25e23386409848ce8bfe237b9facdee7e7993bc88a1c5cf8f3bfee2d6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,8 +515,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd59048ad1ce2766a5eb85d0899eb2cfc5b1231553dfb2a1b7712ecc99982b314",
-        "network" : "Homestead",
+        "lastblockhash" : "0x87a7ee764832767a3ee71463240e4f601474630aad7502eaf3d6b77be1585574",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -452,10 +567,10 @@
             }
         }
     },
-    "CallEcrecoverCheckLength_d0g0v0_Metropolis" : {
+    "CallEcrecoverCheckLength_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/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,19 +581,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014b3e",
-                    "hash" : "0xa51e6d91894e5fd0681505f5570b6e0cfe40af681d69c480698eff25361d441c",
-                    "mixHash" : "0xe02d01612e218642cf8c6fb27781ac1f0a1c11fbe6abd89e9fb58aba89379bbe",
-                    "nonce" : "0xbe6aa2c95f2ff8d5",
+                    "gasUsed" : "0x01aa52",
+                    "hash" : "0x1200a19e6b1fbf678c88b38dd5518ae2f111aa6a4481c026da399543933bc18b",
+                    "mixHash" : "0x11999783236d43603b273a2077e615b6f8822e1972835e884387d20d000223e7",
+                    "nonce" : "0x846420d1c52a6b13",
                     "number" : "0x01",
                     "parentHash" : "0x4779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199",
-                    "receiptTrie" : "0x132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54",
-                    "stateRoot" : "0x978ee4002e008242b3726ad6bbd007704c17226c5c6c027eff9d25e1bf58a181",
+                    "receiptTrie" : "0xf6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576",
+                    "stateRoot" : "0xef11fc6385cc5c475fa644724e94d9232b0bd0af2f2984248a757ce249a9ce4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0978ee4002e008242b3726ad6bbd007704c17226c5c6c027eff9d25e1bf58a181a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0132bb7966c5e1dc7231d68309a52e2c7f0348cd1c04f5a07a8c377679da2ec54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014b3e8203e880a0e02d01612e218642cf8c6fb27781ac1f0a1c11fbe6abd89e9fb58aba89379bbe88be6aa2c95f2ff8d5f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a04779458be43d7ced351b9480d0b27a4cf6d7552ae0625f2d8930303d8d33b199a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef11fc6385cc5c475fa644724e94d9232b0bd0af2f2984248a757ce249a9ce4aa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6b64a0c23380fa426244c5128467bd6d88414988e65b59abd2db57d8a933576b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aa528203e880a011999783236d43603b273a2077e615b6f8822e1972835e884387d20d000223e788846420d1c52a6b13f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -515,10 +630,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06840ba7a23a7fdbfb7b9e3b1a0badb5cee3367402c8907b4adb016d9a46f578ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa51e6d91894e5fd0681505f5570b6e0cfe40af681d69c480698eff25361d441c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1200a19e6b1fbf678c88b38dd5518ae2f111aa6a4481c026da399543933bc18b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -536,14 +651,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54b3e",
+                "balance" : "0x4563918244f5aa52",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612e22",
+                "balance" : "0x0de0b6b3a760cf0e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0.json
index 6402aa244..01272bac0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecoverH_prefixed0_d0g0v0_EIP150" : {
+    "CallEcrecoverH_prefixed0_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/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017332",
-                    "hash" : "0x1945ee413f43ba8fbdeddb2a5ebb47b1a8e5f36f4c80778134d48f05089f9442",
-                    "mixHash" : "0x4df12cea84ee1803acc7442b82557184ca23cbcae10460557aadb7d2522eef4f",
-                    "nonce" : "0xc4bf60c6cd881af9",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x7b7141e2602a2eb165ef87825579af745598d6a8b43b31245ad48a54eec1570e",
+                    "mixHash" : "0xa9df12de67247caecc8c65a8cfab74805ac9ba6261a5ffc65dc95c5b4c12de7f",
+                    "nonce" : "0xeefe12912357433c",
                     "number" : "0x01",
                     "parentHash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
-                    "receiptTrie" : "0x2ea1d8547cb8a7718850dec3471d5324ef6e592d4f4e8ceb9c1cf5baeee382ac",
-                    "stateRoot" : "0x44154902cdd28069ba145828acfe05ed24697f16d299fe47d2a46d171e31faf5",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0xbb434963b37eeb214ffda7408e92f34837cb7e69d5409fd220e798f2d2b9905f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044154902cdd28069ba145828acfe05ed24697f16d299fe47d2a46d171e31faf5a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a02ea1d8547cb8a7718850dec3471d5324ef6e592d4f4e8ceb9c1cf5baeee382acb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173328203e880a04df12cea84ee1803acc7442b82557184ca23cbcae10460557aadb7d2522eef4f88c4bf60c6cd881af9f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb434963b37eeb214ffda7408e92f34837cb7e69d5409fd220e798f2d2b9905fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0a9df12de67247caecc8c65a8cfab74805ac9ba6261a5ffc65dc95c5b4c12de7f88eefe12912357433cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1945ee413f43ba8fbdeddb2a5ebb47b1a8e5f36f4c80778134d48f05089f9442",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7b7141e2602a2eb165ef87825579af745598d6a8b43b31245ad48a54eec1570e",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57332",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761062e",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallEcrecoverH_prefixed0_d0g0v0_EIP158" : {
+    "CallEcrecoverH_prefixed0_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/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0111b2",
-                    "hash" : "0xadce7a8602ed1eca94c12c0871a66165b42932f922ecbbb45528c6427d4831b5",
-                    "mixHash" : "0x02e16c90f491a3708cec422550f647870733f47c60b60b94f69a8cf46c38468b",
-                    "nonce" : "0xf391e9f3aba4c098",
+                    "hash" : "0x1b251358465184dc2f2a185befd329caf35ec8aab78ef49944203ac970abcd0e",
+                    "mixHash" : "0x5b3eae71fef49e804b2c48f95c37ae4a85c0dc835f8527e1ee2109c44d02a246",
+                    "nonce" : "0x3150a66a4c271677",
                     "number" : "0x01",
                     "parentHash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
-                    "receiptTrie" : "0x74026c2f745529391ee5bb1159aca85b24742cf6958b6ba4cbf6d5e19683959f",
-                    "stateRoot" : "0x310a70966ff15f0c645b2d21266b961a37642a168839dfd597110dfaa0b690d6",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0xbb434963b37eeb214ffda7408e92f34837cb7e69d5409fd220e798f2d2b9905f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0310a70966ff15f0c645b2d21266b961a37642a168839dfd597110dfaa0b690d6a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074026c2f745529391ee5bb1159aca85b24742cf6958b6ba4cbf6d5e19683959fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a002e16c90f491a3708cec422550f647870733f47c60b60b94f69a8cf46c38468b88f391e9f3aba4c098f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb434963b37eeb214ffda7408e92f34837cb7e69d5409fd220e798f2d2b9905fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a05b3eae71fef49e804b2c48f95c37ae4a85c0dc835f8527e1ee2109c44d02a246883150a66a4c271677f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadce7a8602ed1eca94c12c0871a66165b42932f922ecbbb45528c6427d4831b5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1b251358465184dc2f2a185befd329caf35ec8aab78ef49944203ac970abcd0e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallEcrecoverH_prefixed0_d0g0v0_Frontier" : {
+    "CallEcrecoverH_prefixed0_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/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017008",
-                    "hash" : "0x390ae2922c5e217969bb089f06b4c97ac9e01509b93f8ed65b48d2961760d0e1",
-                    "mixHash" : "0x9b340683eca952e36cff426e00dfbedcbc15c9738e8cf976cb1d8fb43c153bd6",
-                    "nonce" : "0xa502075e2df2d37a",
+                    "gasUsed" : "0x017332",
+                    "hash" : "0xe6fcaa65a7a6e9126689344c8e5757f8a29c293aae77db8c36ded26827d7fc5a",
+                    "mixHash" : "0x9b84bd7a1a39c06db3728723f565b4a66f0e4ad98f8733b95fab0b6365e404a0",
+                    "nonce" : "0xcca24a4393febeed",
                     "number" : "0x01",
                     "parentHash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
-                    "receiptTrie" : "0x087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9",
-                    "stateRoot" : "0xefcfb6de0677939d962790e29e7a5ffd33d41dc28c29b541ea3e4406d9923c3b",
+                    "receiptTrie" : "0x2ea1d8547cb8a7718850dec3471d5324ef6e592d4f4e8ceb9c1cf5baeee382ac",
+                    "stateRoot" : "0x44154902cdd28069ba145828acfe05ed24697f16d299fe47d2a46d171e31faf5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efcfb6de0677939d962790e29e7a5ffd33d41dc28c29b541ea3e4406d9923c3ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a09b340683eca952e36cff426e00dfbedcbc15c9738e8cf976cb1d8fb43c153bd688a502075e2df2d37af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044154902cdd28069ba145828acfe05ed24697f16d299fe47d2a46d171e31faf5a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a02ea1d8547cb8a7718850dec3471d5324ef6e592d4f4e8ceb9c1cf5baeee382acb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173328203e880a09b84bd7a1a39c06db3728723f565b4a66f0e4ad98f8733b95fab0b6365e404a088cca24a4393febeedf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x390ae2922c5e217969bb089f06b4c97ac9e01509b93f8ed65b48d2961760d0e1",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe6fcaa65a7a6e9126689344c8e5757f8a29c293aae77db8c36ded26827d7fc5a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57008",
+                "balance" : "0x4563918244f57332",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7610958",
+                "balance" : "0x0de0b6b3a761062e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallEcrecoverH_prefixed0_d0g0v0_Homestead" : {
+    "CallEcrecoverH_prefixed0_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0xac3ebbb85240ff1d43982a3e281508d98c8a714816104646da882921af081b07",
+                    "mixHash" : "0xe73dbdcfee148e2b228a9f8d9984bef8281604ed69d029cb5add694437a462af",
+                    "nonce" : "0x1c4fe40b03622ff3",
+                    "number" : "0x01",
+                    "parentHash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
+                    "receiptTrie" : "0x74026c2f745529391ee5bb1159aca85b24742cf6958b6ba4cbf6d5e19683959f",
+                    "stateRoot" : "0x310a70966ff15f0c645b2d21266b961a37642a168839dfd597110dfaa0b690d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0310a70966ff15f0c645b2d21266b961a37642a168839dfd597110dfaa0b690d6a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074026c2f745529391ee5bb1159aca85b24742cf6958b6ba4cbf6d5e19683959fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0e73dbdcfee148e2b228a9f8d9984bef8281604ed69d029cb5add694437a462af881c4fe40b03622ff3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xac3ebbb85240ff1d43982a3e281508d98c8a714816104646da882921af081b07",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa0b29af6a56d6cfef6415cb195ccbe540e006d0a",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f511b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76167ae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecoverH_prefixed0_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/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017008",
-                    "hash" : "0xd1e458cd65f825fcdf7c91bd2d877b3dde4d83e8d37307b87a26cb9db5e6b9c7",
-                    "mixHash" : "0x851f47dafe1da08da23de4e6a9315dfba99a1723106dcf4d7e266ec30409b438",
-                    "nonce" : "0xe406b830259ed34a",
+                    "hash" : "0xb1d0adc91b45ff2e581ad356a491a544546c8bb1c225ae1f6606c0faa62387cd",
+                    "mixHash" : "0x5962aa97930074f8bf7d228f4283889f8b50588a62b2a72b225a75b263344076",
+                    "nonce" : "0x96f19f141a4ea90d",
                     "number" : "0x01",
                     "parentHash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
                     "receiptTrie" : "0x087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efcfb6de0677939d962790e29e7a5ffd33d41dc28c29b541ea3e4406d9923c3ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a0851f47dafe1da08da23de4e6a9315dfba99a1723106dcf4d7e266ec30409b43888e406b830259ed34af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efcfb6de0677939d962790e29e7a5ffd33d41dc28c29b541ea3e4406d9923c3ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a05962aa97930074f8bf7d228f4283889f8b50588a62b2a72b225a75b2633440768896f19f141a4ea90df865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1e458cd65f825fcdf7c91bd2d877b3dde4d83e8d37307b87a26cb9db5e6b9c7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb1d0adc91b45ff2e581ad356a491a544546c8bb1c225ae1f6606c0faa62387cd",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallEcrecoverH_prefixed0_d0g0v0_Metropolis" : {
+    "CallEcrecoverH_prefixed0_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/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0111b2",
-                    "hash" : "0x6a37dddfb63f14fb1253c763e5d8913b7c6b0fb3e763ffe257cce361be8da640",
-                    "mixHash" : "0xdf4af02e936dda154ed8b05168c84b396e8a8691b82950367e5aac7650b473b6",
-                    "nonce" : "0x400f9c7b3758d85a",
+                    "gasUsed" : "0x017008",
+                    "hash" : "0x62557f1639e24cd720a39ee796f9d98a5787876042fd74a30015862e7d157851",
+                    "mixHash" : "0xded4f5d66a7b7bdc3baa2a304efd0d4fefb25dec87aa90475726f1a387b0c7e0",
+                    "nonce" : "0x43d0066cc863c52d",
                     "number" : "0x01",
                     "parentHash" : "0x81225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7",
-                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
-                    "stateRoot" : "0xbb434963b37eeb214ffda7408e92f34837cb7e69d5409fd220e798f2d2b9905f",
+                    "receiptTrie" : "0x087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9",
+                    "stateRoot" : "0xefcfb6de0677939d962790e29e7a5ffd33d41dc28c29b541ea3e4406d9923c3b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb434963b37eeb214ffda7408e92f34837cb7e69d5409fd220e798f2d2b9905fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0df4af02e936dda154ed8b05168c84b396e8a8691b82950367e5aac7650b473b688400f9c7b3758d85af865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a081225230aa1f9bcd6147572dfcb46cf4a678b8d182edb0a6dd25174fa7e165e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efcfb6de0677939d962790e29e7a5ffd33d41dc28c29b541ea3e4406d9923c3ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0087e02f71c690247466dc809ccc013f138cce3d07903d5a71ed5ffc9470ac7a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a0ded4f5d66a7b7bdc3baa2a304efd0d4fefb25dec87aa90475726f1a387b0c7e08843d0066cc863c52df865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d6948bdc62c49b9930c2cdf1d2abb6b036540f7213dc8eb20f40c51bb7338fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a37dddfb63f14fb1253c763e5d8913b7c6b0fb3e763ffe257cce361be8da640",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x62557f1639e24cd720a39ee796f9d98a5787876042fd74a30015862e7d157851",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f511b2",
+                "balance" : "0x4563918244f57008",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167ae",
+                "balance" : "0x0de0b6b3a7610958",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0.json
index b321fe3d1..063974e62 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecoverR_prefixed0_d0g0v0_EIP150" : {
+    "CallEcrecoverR_prefixed0_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/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01389a",
-                    "hash" : "0x5834a2131835c340b7b7d05f43107fb9622030bf2c0bb560c85d0336b971e859",
-                    "mixHash" : "0x75a7fff040ee59063764af4a606a744fee3e32831558b340d5baac89b360e4e4",
-                    "nonce" : "0xaf6137c34ea5f5a2",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0xa3cb2c842560162b5ce5c7e63c8b9d14c1ece3b76582fdf1530825c94286afcd",
+                    "mixHash" : "0xce6bf9adbca11716835bdd7be8c3b5a8d16ef50c47e837e95eda84596c8a5a50",
+                    "nonce" : "0x56808440bcdf777e",
                     "number" : "0x01",
                     "parentHash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
-                    "receiptTrie" : "0x7485ba476da464b70c2b4cf2e536fb4924e1517e340018088bebaea090dc7ce4",
-                    "stateRoot" : "0x1e6d855c62eb00ebac55d0bb672cbd033f7a05094438c4d0d6b78b644763ea0c",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0xd65484da9971a3ebf58e29386cdcb4154a2056923f078950ba448222d7989bf2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e6d855c62eb00ebac55d0bb672cbd033f7a05094438c4d0d6b78b644763ea0ca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a07485ba476da464b70c2b4cf2e536fb4924e1517e340018088bebaea090dc7ce4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a075a7fff040ee59063764af4a606a744fee3e32831558b340d5baac89b360e4e488af6137c34ea5f5a2f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d65484da9971a3ebf58e29386cdcb4154a2056923f078950ba448222d7989bf2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0ce6bf9adbca11716835bdd7be8c3b5a8d16ef50c47e837e95eda84596c8a5a508856808440bcdf777ef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5834a2131835c340b7b7d05f43107fb9622030bf2c0bb560c85d0336b971e859",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa3cb2c842560162b5ce5c7e63c8b9d14c1ece3b76582fdf1530825c94286afcd",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5389a",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76140c6",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallEcrecoverR_prefixed0_d0g0v0_EIP158" : {
+    "CallEcrecoverR_prefixed0_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/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x34c58d85e4523c060964f7c0e628472bd022cbb6192caa4076ef7855af0101f9",
-                    "mixHash" : "0xaf1c03cc8757957b180bb23a38a6f5c9ed727fd12a329c33bdba3e31f694181c",
-                    "nonce" : "0x8f2435e81c55955d",
+                    "hash" : "0x4aea8590fa8c82bb4a01e0395bb2c86d207bb898ebdd49f0a17c7d6ec078cb67",
+                    "mixHash" : "0x8688f633ef5017e933f99df8b0ad872a9015fe4ca78acf3c0fcccb7db9b81c28",
+                    "nonce" : "0xfb091d734d1800ce",
                     "number" : "0x01",
                     "parentHash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
-                    "receiptTrie" : "0x85a2bb5b278bd092948f338f869af6c9f35246416815911e013a49c4f0342423",
-                    "stateRoot" : "0xf5d8d1062ded5815ad6fee1613fd9ccd03dd63244672f6be51eb1418f957ff9e",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0xd65484da9971a3ebf58e29386cdcb4154a2056923f078950ba448222d7989bf2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5d8d1062ded5815ad6fee1613fd9ccd03dd63244672f6be51eb1418f957ff9ea0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a085a2bb5b278bd092948f338f869af6c9f35246416815911e013a49c4f0342423b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0af1c03cc8757957b180bb23a38a6f5c9ed727fd12a329c33bdba3e31f694181c888f2435e81c55955df865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90262f901f7a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d65484da9971a3ebf58e29386cdcb4154a2056923f078950ba448222d7989bf2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a08688f633ef5017e933f99df8b0ad872a9015fe4ca78acf3c0fcccb7db9b81c2888fb091d734d1800cef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34c58d85e4523c060964f7c0e628472bd022cbb6192caa4076ef7855af0101f9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4aea8590fa8c82bb4a01e0395bb2c86d207bb898ebdd49f0a17c7d6ec078cb67",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallEcrecoverR_prefixed0_d0g0v0_Frontier" : {
+    "CallEcrecoverR_prefixed0_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/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013570",
-                    "hash" : "0x01c7d1edd78e8a98e12d6b773ade7f49f93c85d434aaacdabc0a13c837a287fa",
-                    "mixHash" : "0x10631c0b22afa55260fdef163b3bb605707ae3ac27871eb29bc4832aa179945a",
-                    "nonce" : "0xe7d1f3b576b85822",
+                    "gasUsed" : "0x01389a",
+                    "hash" : "0xbdf6ef41b3d79a3bf7ddd85648abfbf0cecefd45ad2231e441207669411cd144",
+                    "mixHash" : "0x09b216424911c6cf84a72b08a492b26999bfa84b161b2fe0a09cfeddbf9bcfa7",
+                    "nonce" : "0xd9ea9c2a52f68c4c",
                     "number" : "0x01",
                     "parentHash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
-                    "receiptTrie" : "0x2fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4",
-                    "stateRoot" : "0x063d2cc2c186852d7ab9ae2ccab6f50f0f929502f51533a08688fc6a41b61e1b",
+                    "receiptTrie" : "0x7485ba476da464b70c2b4cf2e536fb4924e1517e340018088bebaea090dc7ce4",
+                    "stateRoot" : "0x1e6d855c62eb00ebac55d0bb672cbd033f7a05094438c4d0d6b78b644763ea0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063d2cc2c186852d7ab9ae2ccab6f50f0f929502f51533a08688fc6a41b61e1ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a02fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a010631c0b22afa55260fdef163b3bb605707ae3ac27871eb29bc4832aa179945a88e7d1f3b576b85822f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e6d855c62eb00ebac55d0bb672cbd033f7a05094438c4d0d6b78b644763ea0ca0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a07485ba476da464b70c2b4cf2e536fb4924e1517e340018088bebaea090dc7ce4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a009b216424911c6cf84a72b08a492b26999bfa84b161b2fe0a09cfeddbf9bcfa788d9ea9c2a52f68c4cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01c7d1edd78e8a98e12d6b773ade7f49f93c85d434aaacdabc0a13c837a287fa",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbdf6ef41b3d79a3bf7ddd85648abfbf0cecefd45ad2231e441207669411cd144",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53570",
+                "balance" : "0x4563918244f5389a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76143f0",
+                "balance" : "0x0de0b6b3a76140c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallEcrecoverR_prefixed0_d0g0v0_Homestead" : {
+    "CallEcrecoverR_prefixed0_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/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x2237a4ff87ca8d77f96fdfdb25aab8ddc0b03ad272908953ed7a318fb14b8222",
+                    "mixHash" : "0xd4693c3d4c86d03de160f504a01a8474bbb19786bcf40d0fba0b42284830f7da",
+                    "nonce" : "0x928a2e1e438e89dc",
+                    "number" : "0x01",
+                    "parentHash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
+                    "receiptTrie" : "0x85a2bb5b278bd092948f338f869af6c9f35246416815911e013a49c4f0342423",
+                    "stateRoot" : "0xf5d8d1062ded5815ad6fee1613fd9ccd03dd63244672f6be51eb1418f957ff9e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5d8d1062ded5815ad6fee1613fd9ccd03dd63244672f6be51eb1418f957ff9ea0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a085a2bb5b278bd092948f338f869af6c9f35246416815911e013a49c4f0342423b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0d4693c3d4c86d03de160f504a01a8474bbb19786bcf40d0fba0b42284830f7da88928a2e1e438e89dcf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x88caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445ac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2237a4ff87ca8d77f96fdfdb25aab8ddc0b03ad272908953ed7a318fb14b8222",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a246",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecoverR_prefixed0_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013570",
-                    "hash" : "0x66df775869427d43a7380afac52e42a4498e30bbb3855e813d961c5bc980ea3e",
-                    "mixHash" : "0x37c140f796d3203506841b8891c67ab3874bc7ea14e7cdce3cd1c6d6cf53690d",
-                    "nonce" : "0x68e088469832124d",
+                    "hash" : "0x77961e873c64195dc0cc967c0a2fc0d53302b09a73e736adbadff2d7baaf7721",
+                    "mixHash" : "0x6b3dccf727483ad503c64e9923f746ee7b7f1fadfe779b8fd8a26c2e81cdfde5",
+                    "nonce" : "0x427048d067afbec3",
                     "number" : "0x01",
                     "parentHash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
                     "receiptTrie" : "0x2fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063d2cc2c186852d7ab9ae2ccab6f50f0f929502f51533a08688fc6a41b61e1ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a02fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a037c140f796d3203506841b8891c67ab3874bc7ea14e7cdce3cd1c6d6cf53690d8868e088469832124df865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063d2cc2c186852d7ab9ae2ccab6f50f0f929502f51533a08688fc6a41b61e1ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a02fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a06b3dccf727483ad503c64e9923f746ee7b7f1fadfe779b8fd8a26c2e81cdfde588427048d067afbec3f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66df775869427d43a7380afac52e42a4498e30bbb3855e813d961c5bc980ea3e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x77961e873c64195dc0cc967c0a2fc0d53302b09a73e736adbadff2d7baaf7721",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallEcrecoverR_prefixed0_d0g0v0_Metropolis" : {
+    "CallEcrecoverR_prefixed0_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/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0xcd97219c1d01d2aa6aac9aacf82027b6ea8cac9591b9835905407c3dc148db86",
-                    "mixHash" : "0x91bd53c3e1f122c2d5b5413f897545b1021989eb5294254529235408b0e0d0bf",
-                    "nonce" : "0xd8bd816f09fe6f77",
+                    "gasUsed" : "0x013570",
+                    "hash" : "0x3669fb149b7b3dbe942ca5efd3795152dbeda81d1916f34be53e49132947a63b",
+                    "mixHash" : "0xea4031831535203c5220b99ccfdd63b0344e28cb481d41bb37caccff84eb4ac1",
+                    "nonce" : "0xa146943830e89732",
                     "number" : "0x01",
                     "parentHash" : "0xe3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0xd65484da9971a3ebf58e29386cdcb4154a2056923f078950ba448222d7989bf2",
+                    "receiptTrie" : "0x2fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4",
+                    "stateRoot" : "0x063d2cc2c186852d7ab9ae2ccab6f50f0f929502f51533a08688fc6a41b61e1b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d65484da9971a3ebf58e29386cdcb4154a2056923f078950ba448222d7989bf2a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a091bd53c3e1f122c2d5b5413f897545b1021989eb5294254529235408b0e0d0bf88d8bd816f09fe6f77f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0e3cd5f2e2e01c9c481554a5874eb488b951060240bc0a2d060a605a53c0c4236a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063d2cc2c186852d7ab9ae2ccab6f50f0f929502f51533a08688fc6a41b61e1ba0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a02fb9021ba860bd4be5ee018cc53674d8a91c8298bf7ca641926a3cd7503e5bd4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0ea4031831535203c5220b99ccfdd63b0344e28cb481d41bb37caccff84eb4ac188a146943830e89732f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088caafd59752afa348f2aaca6c5ad9a30df0ca628dfd5ff699a16766002445aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd97219c1d01d2aa6aac9aacf82027b6ea8cac9591b9835905407c3dc148db86",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3669fb149b7b3dbe942ca5efd3795152dbeda81d1916f34be53e49132947a63b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f53570",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a76143f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0.json
index a2806f0c1..378ca28f2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecoverS_prefixed0_d0g0v0_EIP150" : {
+    "CallEcrecoverS_prefixed0_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/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017332",
-                    "hash" : "0xc706bff3f0c77a08a132376c2837f10e39ba320bbfff26d3bafffee1edbef41b",
-                    "mixHash" : "0xdc70c2b0c7895574260c35010c1dccfdd99c53937c45a52a359b1c122fe8a587",
-                    "nonce" : "0x2544f148a01343b8",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0xdf7bc1e46a5332f011d77dad7398a270a2f30d835dfdf609c6b802c7c46cb347",
+                    "mixHash" : "0x008fa611f81f578de416f282d744085d6feeff1284b5fc662a9b9bd84e49e38e",
+                    "nonce" : "0x000df37a1600ae17",
                     "number" : "0x01",
                     "parentHash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
-                    "receiptTrie" : "0x969112b4e8bae9b83201bda2c46159292cb9121dd5e4fd43828b002f55776673",
-                    "stateRoot" : "0xa063b5c1c8bc5713f2615824b157ac8270fb55cde3e576fd83231da5a8d4f3cf",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x308bb4369aae1a47862802dc00e5314ccb1498a550d86934eddbd558c32e18a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a063b5c1c8bc5713f2615824b157ac8270fb55cde3e576fd83231da5a8d4f3cfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0969112b4e8bae9b83201bda2c46159292cb9121dd5e4fd43828b002f55776673b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173328203e880a0dc70c2b0c7895574260c35010c1dccfdd99c53937c45a52a359b1c122fe8a587882544f148a01343b8f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0308bb4369aae1a47862802dc00e5314ccb1498a550d86934eddbd558c32e18a8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0008fa611f81f578de416f282d744085d6feeff1284b5fc662a9b9bd84e49e38e88000df37a1600ae17f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc706bff3f0c77a08a132376c2837f10e39ba320bbfff26d3bafffee1edbef41b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdf7bc1e46a5332f011d77dad7398a270a2f30d835dfdf609c6b802c7c46cb347",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57332",
+                "balance" : "0x4563918244f511b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761062e",
+                "balance" : "0x0de0b6b3a76167ae",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallEcrecoverS_prefixed0_d0g0v0_EIP158" : {
+    "CallEcrecoverS_prefixed0_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/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0111b2",
-                    "hash" : "0x73555bee0e0cfb430b4c443452825eafb1ce1df8177350c02934e1d5e4287106",
-                    "mixHash" : "0x852ca03381eb53c3f4a55f795b7c8ae929a5e486334de01bde0c2ffcc2578a34",
-                    "nonce" : "0x8b81704f19476f3b",
+                    "hash" : "0x9645a81a8990f55ee29e6bd54e141573623ca25368e32e7933d4e5041ff06aa7",
+                    "mixHash" : "0x1be9e4aa604fca3bbfc213b633e91bed8b11cd09087103bf83cf7b4b151d8e62",
+                    "nonce" : "0x967d6077024ccb2c",
                     "number" : "0x01",
                     "parentHash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
-                    "receiptTrie" : "0x41161568b2037b4b33f04eb211fcb4c7232683fba053f18b16d193c723607468",
-                    "stateRoot" : "0x6069ea6039c2c610ae34c491ab9c2bab289291f12be9210476e9ce0552963d06",
+                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
+                    "stateRoot" : "0x308bb4369aae1a47862802dc00e5314ccb1498a550d86934eddbd558c32e18a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06069ea6039c2c610ae34c491ab9c2bab289291f12be9210476e9ce0552963d06a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a041161568b2037b4b33f04eb211fcb4c7232683fba053f18b16d193c723607468b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0852ca03381eb53c3f4a55f795b7c8ae929a5e486334de01bde0c2ffcc2578a34888b81704f19476f3bf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0308bb4369aae1a47862802dc00e5314ccb1498a550d86934eddbd558c32e18a8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a01be9e4aa604fca3bbfc213b633e91bed8b11cd09087103bf83cf7b4b151d8e6288967d6077024ccb2cf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73555bee0e0cfb430b4c443452825eafb1ce1df8177350c02934e1d5e4287106",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9645a81a8990f55ee29e6bd54e141573623ca25368e32e7933d4e5041ff06aa7",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallEcrecoverS_prefixed0_d0g0v0_Frontier" : {
+    "CallEcrecoverS_prefixed0_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/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017008",
-                    "hash" : "0x43393c5102dda6446d2cd4a2c4dfa46ba3941894587e6f0568ed52c15581404f",
-                    "mixHash" : "0x3161375f1db1016772e446616afdb40a3f798967aa3f795e75eccce97e634eac",
-                    "nonce" : "0x74b371cb839aaa99",
+                    "gasUsed" : "0x017332",
+                    "hash" : "0x8bad32134cf70f4ce901058e0f105a85fe2b5ba6a01e3b0d34fb6dfb2c64ed93",
+                    "mixHash" : "0xe1e209b3778b966f62214921cd20cd975afbae3930076bd952c365449e3471de",
+                    "nonce" : "0x5526da468cb309cc",
                     "number" : "0x01",
                     "parentHash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
-                    "receiptTrie" : "0x63914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2cc",
-                    "stateRoot" : "0x56c6811c9ba3c8cca9ba0a0d6fda042c530f32a663deed0f3656364a62245914",
+                    "receiptTrie" : "0x969112b4e8bae9b83201bda2c46159292cb9121dd5e4fd43828b002f55776673",
+                    "stateRoot" : "0xa063b5c1c8bc5713f2615824b157ac8270fb55cde3e576fd83231da5a8d4f3cf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056c6811c9ba3c8cca9ba0a0d6fda042c530f32a663deed0f3656364a62245914a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a063914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a03161375f1db1016772e446616afdb40a3f798967aa3f795e75eccce97e634eac8874b371cb839aaa99f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a063b5c1c8bc5713f2615824b157ac8270fb55cde3e576fd83231da5a8d4f3cfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0969112b4e8bae9b83201bda2c46159292cb9121dd5e4fd43828b002f55776673b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173328203e880a0e1e209b3778b966f62214921cd20cd975afbae3930076bd952c365449e3471de885526da468cb309ccf865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43393c5102dda6446d2cd4a2c4dfa46ba3941894587e6f0568ed52c15581404f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8bad32134cf70f4ce901058e0f105a85fe2b5ba6a01e3b0d34fb6dfb2c64ed93",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57008",
+                "balance" : "0x4563918244f57332",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7610958",
+                "balance" : "0x0de0b6b3a761062e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallEcrecoverS_prefixed0_d0g0v0_Homestead" : {
+    "CallEcrecoverS_prefixed0_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0111b2",
+                    "hash" : "0x54c6aa9937b8a9f901da70383e6205943e981c749b5697c74912b7ad96a51335",
+                    "mixHash" : "0xa434571b6ee6b31b35d68e76465b0c31b10e75a6404f1af0b8b6497f3a2f097f",
+                    "nonce" : "0x3b815eda8808b191",
+                    "number" : "0x01",
+                    "parentHash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
+                    "receiptTrie" : "0x41161568b2037b4b33f04eb211fcb4c7232683fba053f18b16d193c723607468",
+                    "stateRoot" : "0x6069ea6039c2c610ae34c491ab9c2bab289291f12be9210476e9ce0552963d06",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06069ea6039c2c610ae34c491ab9c2bab289291f12be9210476e9ce0552963d06a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a041161568b2037b4b33f04eb211fcb4c7232683fba053f18b16d193c723607468b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0a434571b6ee6b31b35d68e76465b0c31b10e75a6404f1af0b8b6497f3a2f097f883b815eda8808b191f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x54c6aa9937b8a9f901da70383e6205943e981c749b5697c74912b7ad96a51335",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xb4950a7fad428434b11c357fa6d4b4bcd3096a5d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f511b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76167ae",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecoverS_prefixed0_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/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017008",
-                    "hash" : "0xd0574d69d2bf61a910d4df44e811e4bd4138281cb24a671d10d29504f6f1c028",
-                    "mixHash" : "0xee09f1f30b60ded3b684b2bd092a41da38bc773b73923f863b5c07aff8a54c79",
-                    "nonce" : "0xd6f6dcf5a2de4cb1",
+                    "hash" : "0x53e57f0b29d2c795e7e22cc1bf93b62dd49929e8befb35f83fa84a15afe1eaf3",
+                    "mixHash" : "0x0f3ea2b82acd9703bb619a3efa2ca50ad14484ce1a92ef10d40c7235a188810b",
+                    "nonce" : "0x34cfd0af2dc57539",
                     "number" : "0x01",
                     "parentHash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
                     "receiptTrie" : "0x63914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2cc",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056c6811c9ba3c8cca9ba0a0d6fda042c530f32a663deed0f3656364a62245914a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a063914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a0ee09f1f30b60ded3b684b2bd092a41da38bc773b73923f863b5c07aff8a54c7988d6f6dcf5a2de4cb1f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056c6811c9ba3c8cca9ba0a0d6fda042c530f32a663deed0f3656364a62245914a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a063914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a00f3ea2b82acd9703bb619a3efa2ca50ad14484ce1a92ef10d40c7235a188810b8834cfd0af2dc57539f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0574d69d2bf61a910d4df44e811e4bd4138281cb24a671d10d29504f6f1c028",
-        "network" : "Homestead",
+        "lastblockhash" : "0x53e57f0b29d2c795e7e22cc1bf93b62dd49929e8befb35f83fa84a15afe1eaf3",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallEcrecoverS_prefixed0_d0g0v0_Metropolis" : {
+    "CallEcrecoverS_prefixed0_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/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0111b2",
-                    "hash" : "0xc81a77d1e54e9f41b71d824b152c5f05949c7c1bdd353ef59df438916879f867",
-                    "mixHash" : "0xe664a75dcbd7449799c402324774e30416802474bb6699993a938e336e89af6d",
-                    "nonce" : "0x460b2b9d9b0d03e8",
+                    "gasUsed" : "0x017008",
+                    "hash" : "0xca5788df7d50a649255b3e08ab9ea5beb1db8ec8a8d760246d3775c520c25031",
+                    "mixHash" : "0xf506ba8d0fcdbcd3186e44199ca3e3862fceeb5aaebcd24c738afc94d5f24eac",
+                    "nonce" : "0xf0ddb2b10379cebf",
                     "number" : "0x01",
                     "parentHash" : "0xf500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71ea",
-                    "receiptTrie" : "0x8fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bed",
-                    "stateRoot" : "0x308bb4369aae1a47862802dc00e5314ccb1498a550d86934eddbd558c32e18a8",
+                    "receiptTrie" : "0x63914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2cc",
+                    "stateRoot" : "0x56c6811c9ba3c8cca9ba0a0d6fda042c530f32a663deed0f3656364a62245914",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0308bb4369aae1a47862802dc00e5314ccb1498a550d86934eddbd558c32e18a8a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a08fbd6711d22c0dddd27dc47795cfd4dc354b46449a386445634388d0cf295bedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111b28203e880a0e664a75dcbd7449799c402324774e30416802474bb6699993a938e336e89af6d88460b2b9d9b0d03e8f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a0f500457da68c0df51ae0f44876363dbcc1be9d2fabcbc52b958c63bd222c71eaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056c6811c9ba3c8cca9ba0a0d6fda042c530f32a663deed0f3656364a62245914a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a063914e698ac82b1003861166f66a27483bf2b34065a608665f06d473b115c2ccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830170088203e880a0f506ba8d0fcdbcd3186e44199ca3e3862fceeb5aaebcd24c738afc94d5f24eac88f0ddb2b10379cebff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed7a444d4ec098a18213e9472ff6bbe892606e5ac21c5f89e9c3bd3b0f1b51d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc81a77d1e54e9f41b71d824b152c5f05949c7c1bdd353ef59df438916879f867",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xca5788df7d50a649255b3e08ab9ea5beb1db8ec8a8d760246d3775c520c25031",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f511b2",
+                "balance" : "0x4563918244f57008",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76167ae",
+                "balance" : "0x0de0b6b3a7610958",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0.json
index 35998b248..07f58f859 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecoverV_prefixed0_d0g0v0_EIP150" : {
+    "CallEcrecoverV_prefixed0_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/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01adca",
-                    "hash" : "0x4a1f181abefd31ccfa5bca5538fe5e3038687e70574535ed9ad194b5922f5595",
-                    "mixHash" : "0x34b7b300eab6949413ab07da9aac037dce4101c2134c8a610313a1f59c18dc10",
-                    "nonce" : "0x9f445bd8a5c87219",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0xf389b75bc91e6b834eb4c5086e4caf9b1a6b905f6a27a34ff1f327fe686a6efe",
+                    "mixHash" : "0xafb388fc3e0e76bfa018e69f027fe1226a9da0c17967e44b5b9303c9ffad5c41",
+                    "nonce" : "0xd908b56bac747ab0",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0xf6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4",
-                    "stateRoot" : "0x9f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xfeac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adca8203e880a034b7b300eab6949413ab07da9aac037dce4101c2134c8a610313a1f59c18dc10889f445bd8a5c87219f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0afb388fc3e0e76bfa018e69f027fe1226a9da0c17967e44b5b9303c9ffad5c4188d908b56bac747ab0f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a1f181abefd31ccfa5bca5538fe5e3038687e70574535ed9ad194b5922f5595",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf389b75bc91e6b834eb4c5086e4caf9b1a6b905f6a27a34ff1f327fe686a6efe",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -83,14 +83,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5adca",
+                "balance" : "0x4563918244f54c4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cb96",
+                "balance" : "0x0de0b6b3a7612d16",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -114,10 +114,10 @@
             }
         }
     },
-    "CallEcrecoverV_prefixed0_d0g0v0_EIP158" : {
+    "CallEcrecoverV_prefixed0_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/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x014c4a",
-                    "hash" : "0xae74ca26c822c3438b0fa018f23ae9e01c8c3fc3cea3a87dd39a3b6b450425ae",
-                    "mixHash" : "0x12feb1cec9a77da5025d8bb34b52f99013dc8baaf59122866ed199419d0a512f",
-                    "nonce" : "0xc939a97608678d05",
+                    "hash" : "0x94544be1d3e700783e8997225d26b909fcec86bade6d2e9516c940dd87ce05f8",
+                    "mixHash" : "0xcd02274e00a1e165d09d29c2646aecef495c937d95d8e5d592dc7d88f8490ce4",
+                    "nonce" : "0xad78f65635b3687e",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0x9714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829",
-                    "stateRoot" : "0x0e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137",
+                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
+                    "stateRoot" : "0xfeac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a09714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a012feb1cec9a77da5025d8bb34b52f99013dc8baaf59122866ed199419d0a512f88c939a97608678d05f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0cd02274e00a1e165d09d29c2646aecef495c937d95d8e5d592dc7d88f8490ce488ad78f65635b3687ef865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -177,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae74ca26c822c3438b0fa018f23ae9e01c8c3fc3cea3a87dd39a3b6b450425ae",
-        "network" : "EIP158",
+        "lastblockhash" : "0x94544be1d3e700783e8997225d26b909fcec86bade6d2e9516c940dd87ce05f8",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
@@ -222,10 +229,10 @@
             }
         }
     },
-    "CallEcrecoverV_prefixed0_d0g0v0_Frontier" : {
+    "CallEcrecoverV_prefixed0_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/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,19 +243,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01aaa0",
-                    "hash" : "0xd50e0c27b9ecfb6b74009f40dd9fa9f9f6c22f7986c8c83f7bad13c5a689a93e",
-                    "mixHash" : "0x44648377c73008e45ca78a3573744ff173e1ed0303644aab7e6f950b8ad940cd",
-                    "nonce" : "0xc9d1f5def232c44d",
+                    "gasUsed" : "0x01adca",
+                    "hash" : "0x5a967267f259a51311e4ebd1ade3db85f813641d2d46eb71e87b79ff8a0c29cb",
+                    "mixHash" : "0xad8c97d29c6ca3bf2aa4fdbb3bfc775a369c832b207db0e1a5dc440b6faec6bc",
+                    "nonce" : "0x91e137c5cf83ea3f",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0x74143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4",
-                    "stateRoot" : "0x2064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88f",
+                    "receiptTrie" : "0xf6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4",
+                    "stateRoot" : "0x9f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a044648377c73008e45ca78a3573744ff173e1ed0303644aab7e6f950b8ad940cd88c9d1f5def232c44df865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f169b5ebbd553d2f07e0912209d7ada46e34002e04f656af757c3480d4f34c5a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a0f6c54200ab27f2ea57305f520cf9f47129705bfb051b266ddcb8bc1d7e9f0cf4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adca8203e880a0ad8c97d29c6ca3bf2aa4fdbb3bfc775a369c832b207db0e1a5dc440b6faec6bc8891e137c5cf83ea3ff865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -285,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd50e0c27b9ecfb6b74009f40dd9fa9f9f6c22f7986c8c83f7bad13c5a689a93e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5a967267f259a51311e4ebd1ade3db85f813641d2d46eb71e87b79ff8a0c29cb",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -306,14 +313,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5aaa0",
+                "balance" : "0x4563918244f5adca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760cec0",
+                "balance" : "0x0de0b6b3a760cb96",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,10 +344,118 @@
             }
         }
     },
-    "CallEcrecoverV_prefixed0_d0g0v0_Homestead" : {
+    "CallEcrecoverV_prefixed0_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/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x014c4a",
+                    "hash" : "0xba61707b6923110341a384123dbdf333f544332ecfe700b528e861515fb110b4",
+                    "mixHash" : "0x3b065b86c8d8c81a7056516223b29012aab0e0ecc4feaed7317de9f0527084f9",
+                    "nonce" : "0x2a1db254e523cae7",
+                    "number" : "0x01",
+                    "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
+                    "receiptTrie" : "0x9714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829",
+                    "stateRoot" : "0x0e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e746d72f3b4f14af9f41bb729e0f9525ed4a35ad711414d035691c93e282137a0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a09714fa3b06bfd70bf9f6820584a28538d16c0721ec88f08daebdbf98511f4829b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a03b065b86c8d8c81a7056516223b29012aab0e0ecc4feaed7317de9f0527084f9882a1db254e523cae7f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x37ba90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8e",
+                        "s" : "0x72000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cd",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xba61707b6923110341a384123dbdf333f544332ecfe700b528e861515fb110b4",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f54c4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7612d16",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecoverV_prefixed0_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +467,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01aaa0",
-                    "hash" : "0x194bace4ab1eb435a269a249f93747a898b13a82cef9267e20e69832b44feed2",
-                    "mixHash" : "0x2e00a0d75f85393496c4012f190b61f70b82955cc1aff719fad07d467c219660",
-                    "nonce" : "0x8a5ec6537e6aa516",
+                    "hash" : "0xf77d5bdc8f05f6e468aca718f1c2380693c821a5930a509a8fa8fb914eaf7112",
+                    "mixHash" : "0xba7d7709312f535bd689275eee8d5c813d86362bd855fbde76924376b2ce915f",
+                    "nonce" : "0xd5b6d1026450ea96",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
                     "receiptTrie" : "0x74143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4",
@@ -363,7 +478,7 @@
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a02e00a0d75f85393496c4012f190b61f70b82955cc1aff719fad07d467c219660888a5ec6537e6aa516f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0ba7d7709312f535bd689275eee8d5c813d86362bd855fbde76924376b2ce915f88d5b6d1026450ea96f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,8 +515,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x194bace4ab1eb435a269a249f93747a898b13a82cef9267e20e69832b44feed2",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf77d5bdc8f05f6e468aca718f1c2380693c821a5930a509a8fa8fb914eaf7112",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -452,10 +567,10 @@
             }
         }
     },
-    "CallEcrecoverV_prefixed0_d0g0v0_Metropolis" : {
+    "CallEcrecoverV_prefixed0_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/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,19 +581,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x014c4a",
-                    "hash" : "0x2484293b260c4975b6270e2aced69c74e658c040727b25b3351083c266eb3945",
-                    "mixHash" : "0xb29b2b2a4bae71c58d0a53befe1197ff97ae5436dc4a41728c1e5684de2930e4",
-                    "nonce" : "0x7e5b21ae450041d6",
+                    "gasUsed" : "0x01aaa0",
+                    "hash" : "0x4383d644c29b2fc5b6fab46b770996c89448968bc341f8661bd2346a65f93e44",
+                    "mixHash" : "0xb4c15084e268e51c68ad943f2b569bb9b00b56c8dce5ba2b31da8d4e4619243b",
+                    "nonce" : "0x93d1ac8fc6137876",
                     "number" : "0x01",
                     "parentHash" : "0x89f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015",
-                    "receiptTrie" : "0x1d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668b",
-                    "stateRoot" : "0xfeac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abf",
+                    "receiptTrie" : "0x74143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4",
+                    "stateRoot" : "0x2064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feac95610938d1dcc93c1238da3a1cb74ed8034f74d100df72e1d25340b64abfa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a01d3b13ce31e6cf15ee2e9ed7c6cfbaa9c19d7d8943b4ef8f310949be5b0b668bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083014c4a8203e880a0b29b2b2a4bae71c58d0a53befe1197ff97ae5436dc4a41728c1e5684de2930e4887e5b21ae450041d6f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
+                "rlp" : "0xf90263f901f8a089f44dc9ec0bd3c04d1ae6877e99ca77f81bf16f3ba31d88b357abc419a9e015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02064a8874660df6f41697f10f10ff23e7aa051db1dbf9daecd323dc40b03e88fa0d37192728eefe1f2e2362558635fa7ccf7265c44872f2a269cd9c945bcb9ecb5a074143ce654b2f535b52c681ecc35b4a8efd26f650a6cf91b6414531266234ea4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301aaa08203e880a0b4c15084e268e51c68ad943f2b569bb9b00b56c8dce5ba2b31da8d4e4619243b8893d1ac8fc6137876f865f86380018337ba9094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba03fcfff9e4085fc94af03ad71daa986e585e5b354c2b414a134e0624796a30d8ea072000b0edcceb7d4c1c5b6fed5bd5fcb74789702f3f171f1cd75c617bbb379cdc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -515,10 +630,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e166ac9f6c56a5d927c3fac460cc4eb4da4c48f9fe624d86e5793a5c035a0642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2484293b260c4975b6270e2aced69c74e658c040727b25b3351083c266eb3945",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4383d644c29b2fc5b6fab46b770996c89448968bc341f8661bd2346a65f93e44",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -536,14 +651,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f54c4a",
+                "balance" : "0x4563918244f5aaa0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612d16",
+                "balance" : "0x0de0b6b3a760cec0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0_d0g0v0.json
index 2741e8687..131039cef 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentitiy_0_d0g0v0_EIP150" : {
+    "CallIdentitiy_0_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/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0104c8",
-                    "hash" : "0xe61efde34f5b1a12138d83fb25a3a7542052f2adbe03dc132c37f5a93f4f78a1",
-                    "mixHash" : "0x42b2c53b214844aad4f5229e68235784441d83896603468d9065c55bb8a9ef45",
-                    "nonce" : "0xbed647652dacf66c",
+                    "gasUsed" : "0xa320",
+                    "hash" : "0x3d92263473dfba5d2bf2e92923a6c1dccec1a0553bdcd128eca710bb18eeb53f",
+                    "mixHash" : "0xe14d926b0c96368850cc15659182b628ea7afb72b63e5f131eaee88e76a16497",
+                    "nonce" : "0x7aba73c4a3573424",
                     "number" : "0x01",
                     "parentHash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
-                    "receiptTrie" : "0x4eb828344be4d6b260f798214c24068166a25609e2174a5dceff9c30ad434082",
-                    "stateRoot" : "0xb58e4fad131413df8ec248d5d1c9d7d18a801a1aa74433762e49761faa70bccb",
+                    "receiptTrie" : "0x4cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748",
+                    "stateRoot" : "0xfd345fbcd110204d036641cb75b40125e92516fba8d4d1c8e1b015ea0a5b96b1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b58e4fad131413df8ec248d5d1c9d7d18a801a1aa74433762e49761faa70bccba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04eb828344be4d6b260f798214c24068166a25609e2174a5dceff9c30ad434082b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830104c88203e880a042b2c53b214844aad4f5229e68235784441d83896603468d9065c55bb8a9ef4588bed647652dacf66cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd345fbcd110204d036641cb75b40125e92516fba8d4d1c8e1b015ea0a5b96b1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0e14d926b0c96368850cc15659182b628ea7afb72b63e5f131eaee88e76a16497887aba73c4a3573424f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe61efde34f5b1a12138d83fb25a3a7542052f2adbe03dc132c37f5a93f4f78a1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3d92263473dfba5d2bf2e92923a6c1dccec1a0553bdcd128eca710bb18eeb53f",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000004" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504c8",
+                "balance" : "0x4563918244f4a320",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617498",
+                "balance" : "0x0de0b6b3a761d640",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallIdentitiy_0_d0g0v0_EIP158" : {
+    "CallIdentitiy_0_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/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa320",
-                    "hash" : "0x42482346f9cf1d52e5f1540de32f6127b286da6f6ab594c18b90b2ae29d64a0b",
-                    "mixHash" : "0xeb9dae00d4dd9d88709ba452842cca75d9dd887f25fdf40181aca314cdfa9870",
-                    "nonce" : "0xbc0e9be64c6d9649",
+                    "hash" : "0x9d188c30344a3e6ee7b5df74b9eab7167e6820c3585580adb59942e389817651",
+                    "mixHash" : "0x3d769a79a6d4f3571dd62a55cfd887bd9a088a17f6afd1f4d78489bb30018551",
+                    "nonce" : "0x6564c15cf73c2f30",
                     "number" : "0x01",
                     "parentHash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
-                    "receiptTrie" : "0x06348f20997d65c0096d3e705ee9cf1a60f0a2e2d91220ce794537eb066dab38",
-                    "stateRoot" : "0x7485adf7d27c7d1140d16501a4ce57b483648774ead405d31a202d9717f13691",
+                    "receiptTrie" : "0x4cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748",
+                    "stateRoot" : "0xfd345fbcd110204d036641cb75b40125e92516fba8d4d1c8e1b015ea0a5b96b1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07485adf7d27c7d1140d16501a4ce57b483648774ead405d31a202d9717f13691a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba006348f20997d65c0096d3e705ee9cf1a60f0a2e2d91220ce794537eb066dab38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0eb9dae00d4dd9d88709ba452842cca75d9dd887f25fdf40181aca314cdfa987088bc0e9be64c6d9649f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd345fbcd110204d036641cb75b40125e92516fba8d4d1c8e1b015ea0a5b96b1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a03d769a79a6d4f3571dd62a55cfd887bd9a088a17f6afd1f4d78489bb30018551886564c15cf73c2f30f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42482346f9cf1d52e5f1540de32f6127b286da6f6ab594c18b90b2ae29d64a0b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9d188c30344a3e6ee7b5df74b9eab7167e6820c3585580adb59942e389817651",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600460fff1600051600055",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallIdentitiy_0_d0g0v0_Frontier" : {
+    "CallIdentitiy_0_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/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010234",
-                    "hash" : "0x88ae30b8f6b0caf59273d0dd91b49a2192ba2af6fe9aee543bae46496820a239",
-                    "mixHash" : "0xc3b0627187ca57cd919c5512ddce97a1173dbdffc0c0d7edd9a557ff6812392b",
-                    "nonce" : "0xa0122305267ee79a",
+                    "gasUsed" : "0x0104c8",
+                    "hash" : "0x01719f959f102c4a6d4e0c4e952d95bd9e31c915517dc8ecfddbe8638448a18c",
+                    "mixHash" : "0xd628906995cbf0602bb96346f482948fedd037483bc99095356adcb5ff4f59a4",
+                    "nonce" : "0xb4e38d7631a7e627",
                     "number" : "0x01",
                     "parentHash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
-                    "receiptTrie" : "0xc066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8c",
-                    "stateRoot" : "0xe5c4955267cfe0bcc083d3c7db3c0dad8e2174da91052f31db6b8e09f6d4f7c9",
+                    "receiptTrie" : "0x4eb828344be4d6b260f798214c24068166a25609e2174a5dceff9c30ad434082",
+                    "stateRoot" : "0xb58e4fad131413df8ec248d5d1c9d7d18a801a1aa74433762e49761faa70bccb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c4955267cfe0bcc083d3c7db3c0dad8e2174da91052f31db6b8e09f6d4f7c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830102348203e880a0c3b0627187ca57cd919c5512ddce97a1173dbdffc0c0d7edd9a557ff6812392b88a0122305267ee79af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b58e4fad131413df8ec248d5d1c9d7d18a801a1aa74433762e49761faa70bccba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04eb828344be4d6b260f798214c24068166a25609e2174a5dceff9c30ad434082b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830104c88203e880a0d628906995cbf0602bb96346f482948fedd037483bc99095356adcb5ff4f59a488b4e38d7631a7e627f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88ae30b8f6b0caf59273d0dd91b49a2192ba2af6fe9aee543bae46496820a239",
-        "network" : "Frontier",
+        "lastblockhash" : "0x01719f959f102c4a6d4e0c4e952d95bd9e31c915517dc8ecfddbe8638448a18c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50234",
+                "balance" : "0x4563918244f504c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761772c",
+                "balance" : "0x0de0b6b3a7617498",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallIdentitiy_0_d0g0v0_Homestead" : {
+    "CallIdentitiy_0_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/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xa320",
+                    "hash" : "0x95076ab6cc0f09282cbf1ab6bea97b05f4066fb9ec213be9ab4c1b72a314398d",
+                    "mixHash" : "0xb51c17e7f84522c57d6766bdd92caddb0c16d058a9567e98f69b64cb13f2f558",
+                    "nonce" : "0xabac061137ae0d58",
+                    "number" : "0x01",
+                    "parentHash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
+                    "receiptTrie" : "0x06348f20997d65c0096d3e705ee9cf1a60f0a2e2d91220ce794537eb066dab38",
+                    "stateRoot" : "0x7485adf7d27c7d1140d16501a4ce57b483648774ead405d31a202d9717f13691",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07485adf7d27c7d1140d16501a4ce57b483648774ead405d31a202d9717f13691a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba006348f20997d65c0096d3e705ee9cf1a60f0a2e2d91220ce794537eb066dab38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0b51c17e7f84522c57d6766bdd92caddb0c16d058a9567e98f69b64cb13f2f55888abac061137ae0d58f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x95076ab6cc0f09282cbf1ab6bea97b05f4066fb9ec213be9ab4c1b72a314398d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x600160005260206000602060006000600460fff1600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a320",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d640",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x600160005260206000602060006000600460fff1600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentitiy_0_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x010234",
-                    "hash" : "0x446c07bb01ed1218d86a014fa0c85f69187356eceaca8df9f2ef8674a6caae30",
-                    "mixHash" : "0x20446b4ab13ca5f121fd42b93eb5d4e4aa7676214a29e30c6bc1c41d8e978b02",
-                    "nonce" : "0x81c76289051e06f2",
+                    "hash" : "0x57325d7cb5621cdb305fdfb452a723a91c04598b776d773e2f305a393053e61c",
+                    "mixHash" : "0xf0ece79b21f1d69616d6fb04c865ec507bcebc5507909ec95c5844e4b2f8028b",
+                    "nonce" : "0x072ef83addfd2aac",
                     "number" : "0x01",
                     "parentHash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
                     "receiptTrie" : "0xc066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8c",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c4955267cfe0bcc083d3c7db3c0dad8e2174da91052f31db6b8e09f6d4f7c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830102348203e880a020446b4ab13ca5f121fd42b93eb5d4e4aa7676214a29e30c6bc1c41d8e978b028881c76289051e06f2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c4955267cfe0bcc083d3c7db3c0dad8e2174da91052f31db6b8e09f6d4f7c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830102348203e880a0f0ece79b21f1d69616d6fb04c865ec507bcebc5507909ec95c5844e4b2f8028b88072ef83addfd2aacf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x446c07bb01ed1218d86a014fa0c85f69187356eceaca8df9f2ef8674a6caae30",
-        "network" : "Homestead",
+        "lastblockhash" : "0x57325d7cb5621cdb305fdfb452a723a91c04598b776d773e2f305a393053e61c",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallIdentitiy_0_d0g0v0_Metropolis" : {
+    "CallIdentitiy_0_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/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa320",
-                    "hash" : "0x431e8aa453225771fcd25ee2884b99edd1226bd6805bbfacc56d7eb18f6ae030",
-                    "mixHash" : "0xc50b2de69803e3a434be5555d413e2de8b957456a1077f0e13fb74526f2a95db",
-                    "nonce" : "0x96c858cf50b02b04",
+                    "gasUsed" : "0x010234",
+                    "hash" : "0x266eb6ed464c2b14d23fcfe3059ef11bc92f93cf0348a2813bd23faa7e0f1669",
+                    "mixHash" : "0x8d259907f43c40c1be2724a379fe725c3e8bcff6b59f7d40d455048a9c5e3d16",
+                    "nonce" : "0xaaaeda0b0377c950",
                     "number" : "0x01",
                     "parentHash" : "0x27146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3",
-                    "receiptTrie" : "0x4cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748",
-                    "stateRoot" : "0xfd345fbcd110204d036641cb75b40125e92516fba8d4d1c8e1b015ea0a5b96b1",
+                    "receiptTrie" : "0xc066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8c",
+                    "stateRoot" : "0xe5c4955267cfe0bcc083d3c7db3c0dad8e2174da91052f31db6b8e09f6d4f7c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd345fbcd110204d036641cb75b40125e92516fba8d4d1c8e1b015ea0a5b96b1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04cb3b5edc2502497bc6fb6c28a68ee0ebc959a7286ffbcf2a8ddfca50ea07748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3208203e880a0c50b2de69803e3a434be5555d413e2de8b957456a1077f0e13fb74526f2a95db8896c858cf50b02b04f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a027146d11ebef4b5857c5aa50fd3fe188244623345bf953e29ac4099a7ec204b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5c4955267cfe0bcc083d3c7db3c0dad8e2174da91052f31db6b8e09f6d4f7c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c066e5e00418505230117bfc8d545efe013a73160f7f8d19f2f25b5526457d8cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830102348203e880a08d259907f43c40c1be2724a379fe725c3e8bcff6b59f7d40d455048a9c5e3d1688aaaeda0b0377c950f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a12a2c89370439c59f2ec0b235c3d0b5706b382d8126115c9f8d758890127d77a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x431e8aa453225771fcd25ee2884b99edd1226bd6805bbfacc56d7eb18f6ae030",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x266eb6ed464c2b14d23fcfe3059ef11bc92f93cf0348a2813bd23faa7e0f1669",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a320",
+                "balance" : "0x4563918244f50234",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d640",
+                "balance" : "0x0de0b6b3a761772c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1_d0g0v0.json
index 6857dd745..361d07901 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentitiy_1_d0g0v0_EIP150" : {
+    "CallIdentitiy_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011847",
-                    "hash" : "0x4b6670e3aac97406c1e99afa2824736da15fd1ed568485afda00f003c2489d07",
-                    "mixHash" : "0xfbd2f6dd37ccea5d1d7662521ffdd1d0a716218bc47e801f0b2a4e15ace414b5",
-                    "nonce" : "0x528bcbb10bb8886a",
+                    "gasUsed" : "0xb69f",
+                    "hash" : "0xabb4f2d991180d6807db10c93da3ee7aabd8e96e7403ca6df227c2c93c07e895",
+                    "mixHash" : "0x3413dab4fc6628ed90f604344f39dfdd5dc5e9f2bb27fdd9ee5663eafd1add1a",
+                    "nonce" : "0x8e292156339f4ee6",
                     "number" : "0x01",
                     "parentHash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
-                    "receiptTrie" : "0x3c475e8d5010ddf59e56f6bc0f63e01fe9f589fa6bd97ef411e2f967debb249a",
-                    "stateRoot" : "0xa94eae479e756ead9be6a6d01fe49ce27af39a9aeb16ef05dabd6b8ca566db00",
+                    "receiptTrie" : "0x8303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863",
+                    "stateRoot" : "0xb877206d69a879999a7ea34bc47146b73285e678a24da1872c1eb9ab59c781c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a94eae479e756ead9be6a6d01fe49ce27af39a9aeb16ef05dabd6b8ca566db00a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03c475e8d5010ddf59e56f6bc0f63e01fe9f589fa6bd97ef411e2f967debb249ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830118478203e880a0fbd2f6dd37ccea5d1d7662521ffdd1d0a716218bc47e801f0b2a4e15ace414b588528bcbb10bb8886af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b877206d69a879999a7ea34bc47146b73285e678a24da1872c1eb9ab59c781c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a03413dab4fc6628ed90f604344f39dfdd5dc5e9f2bb27fdd9ee5663eafd1add1a888e292156339f4ee6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b6670e3aac97406c1e99afa2824736da15fd1ed568485afda00f003c2489d07",
-        "network" : "EIP150",
+        "lastblockhash" : "0xabb4f2d991180d6807db10c93da3ee7aabd8e96e7403ca6df227c2c93c07e895",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000004" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51847",
+                "balance" : "0x4563918244f4b69f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616119",
+                "balance" : "0x0de0b6b3a761c2c1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallIdentitiy_1_d0g0v0_EIP158" : {
+    "CallIdentitiy_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb69f",
-                    "hash" : "0xc429f83bc33240a442ec13d779e5ad839748cfcf4187ff0c7bf38ae3778a07ac",
-                    "mixHash" : "0x76db6aa5a3c3566cf8d17f64d54d07f66bf207752c340689aeafa0ecc2b8d55e",
-                    "nonce" : "0x3aa344330a3aa2b4",
+                    "hash" : "0x24fbf7fc3f9149a19353617578c27c5966b581254197d81eaa3b71ece64f3048",
+                    "mixHash" : "0x3463ae85079e4682e4c6e6b06345c1b709a104d8ef216ecc50db525eb942cfd3",
+                    "nonce" : "0xcb5c03d3658d8ca9",
                     "number" : "0x01",
                     "parentHash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
-                    "receiptTrie" : "0x32ce21801edeb1c9d419abe6b2ba5c3ec190c0186454b3c3b1d210fc31fb13ad",
-                    "stateRoot" : "0xd2e2eb39486af6ef1a01257f9f12e12232b06328cdacb549a911ac4c49421e1c",
+                    "receiptTrie" : "0x8303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863",
+                    "stateRoot" : "0xb877206d69a879999a7ea34bc47146b73285e678a24da1872c1eb9ab59c781c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2e2eb39486af6ef1a01257f9f12e12232b06328cdacb549a911ac4c49421e1ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba032ce21801edeb1c9d419abe6b2ba5c3ec190c0186454b3c3b1d210fc31fb13adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a076db6aa5a3c3566cf8d17f64d54d07f66bf207752c340689aeafa0ecc2b8d55e883aa344330a3aa2b4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b877206d69a879999a7ea34bc47146b73285e678a24da1872c1eb9ab59c781c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a03463ae85079e4682e4c6e6b06345c1b709a104d8ef216ecc50db525eb942cfd388cb5c03d3658d8ca9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc429f83bc33240a442ec13d779e5ad839748cfcf4187ff0c7bf38ae3778a07ac",
-        "network" : "EIP158",
+        "lastblockhash" : "0x24fbf7fc3f9149a19353617578c27c5966b581254197d81eaa3b71ece64f3048",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x6020600060006000600060046101f4f1600255600051600055",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallIdentitiy_1_d0g0v0_Frontier" : {
+    "CallIdentitiy_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0115b3",
-                    "hash" : "0x8a4408611c19c3b0d410ea0c7fe1cddb6353463948b98cb412a7735180412d8c",
-                    "mixHash" : "0x8ee4c8e3a0aca121b86cd9ef9fdc0ab9fe6b0bfd82c860c0b803d6b6d414c1ff",
-                    "nonce" : "0x5c78d85e83554aed",
+                    "gasUsed" : "0x011847",
+                    "hash" : "0x9c0a57bd38b6b25760ec70d988066ccf0e0faa55984a00cb03d2c5e5f76426ee",
+                    "mixHash" : "0x2adbb343877c20598c9379f7499e7da80df2ffbd9290c1bb8bb0fd9f4f861954",
+                    "nonce" : "0x3ec0bc44e58eb770",
                     "number" : "0x01",
                     "parentHash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
-                    "receiptTrie" : "0x1f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804f",
-                    "stateRoot" : "0x54377a0b82b46e5b3da88550b5988fd93b0b5dbbdab1ebc38db53b5b52a23517",
+                    "receiptTrie" : "0x3c475e8d5010ddf59e56f6bc0f63e01fe9f589fa6bd97ef411e2f967debb249a",
+                    "stateRoot" : "0xa94eae479e756ead9be6a6d01fe49ce27af39a9aeb16ef05dabd6b8ca566db00",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054377a0b82b46e5b3da88550b5988fd93b0b5dbbdab1ebc38db53b5b52a23517a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115b38203e880a08ee4c8e3a0aca121b86cd9ef9fdc0ab9fe6b0bfd82c860c0b803d6b6d414c1ff885c78d85e83554aedf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a94eae479e756ead9be6a6d01fe49ce27af39a9aeb16ef05dabd6b8ca566db00a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03c475e8d5010ddf59e56f6bc0f63e01fe9f589fa6bd97ef411e2f967debb249ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830118478203e880a02adbb343877c20598c9379f7499e7da80df2ffbd9290c1bb8bb0fd9f4f861954883ec0bc44e58eb770f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a4408611c19c3b0d410ea0c7fe1cddb6353463948b98cb412a7735180412d8c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9c0a57bd38b6b25760ec70d988066ccf0e0faa55984a00cb03d2c5e5f76426ee",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f515b3",
+                "balance" : "0x4563918244f51847",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76163ad",
+                "balance" : "0x0de0b6b3a7616119",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallIdentitiy_1_d0g0v0_Homestead" : {
+    "CallIdentitiy_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xb69f",
+                    "hash" : "0x9d92b4333973e7414801bac77c31f85868b5930916c13f811486e937e25e3757",
+                    "mixHash" : "0xfcd57569d2e2c4c5e65e125c849a00b40caf6d702a8b4cc9baeb61bbaca23d44",
+                    "nonce" : "0xed38dfc34be92e9a",
+                    "number" : "0x01",
+                    "parentHash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
+                    "receiptTrie" : "0x32ce21801edeb1c9d419abe6b2ba5c3ec190c0186454b3c3b1d210fc31fb13ad",
+                    "stateRoot" : "0xd2e2eb39486af6ef1a01257f9f12e12232b06328cdacb549a911ac4c49421e1c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2e2eb39486af6ef1a01257f9f12e12232b06328cdacb549a911ac4c49421e1ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba032ce21801edeb1c9d419abe6b2ba5c3ec190c0186454b3c3b1d210fc31fb13adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a0fcd57569d2e2c4c5e65e125c849a00b40caf6d702a8b4cc9baeb61bbaca23d4488ed38dfc34be92e9af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d92b4333973e7414801bac77c31f85868b5930916c13f811486e937e25e3757",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x6020600060006000600060046101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b69f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761c2c1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x6020600060006000600060046101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentitiy_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0115b3",
-                    "hash" : "0x47d44bd986372e38a372c1ac882a8cd698aa7d3b003ea3bdeb6a0f34bef1214d",
-                    "mixHash" : "0x07b7dffc8a4e884dabc54ed0de4f3edf1300b3f2a2834c40158c502530493c9f",
-                    "nonce" : "0x8e3a2b8a0c1ef6f5",
+                    "hash" : "0x939d252bca5ba12e9f9653c68b1120d47e2c29fb13e41c1e3e2602f784877193",
+                    "mixHash" : "0xeafbd585959a460ff1277f13d0df711830c2ecf33f205158aa44a26674a1ec80",
+                    "nonce" : "0x88de17bde41509d0",
                     "number" : "0x01",
                     "parentHash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
                     "receiptTrie" : "0x1f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804f",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054377a0b82b46e5b3da88550b5988fd93b0b5dbbdab1ebc38db53b5b52a23517a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115b38203e880a007b7dffc8a4e884dabc54ed0de4f3edf1300b3f2a2834c40158c502530493c9f888e3a2b8a0c1ef6f5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054377a0b82b46e5b3da88550b5988fd93b0b5dbbdab1ebc38db53b5b52a23517a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115b38203e880a0eafbd585959a460ff1277f13d0df711830c2ecf33f205158aa44a26674a1ec808888de17bde41509d0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47d44bd986372e38a372c1ac882a8cd698aa7d3b003ea3bdeb6a0f34bef1214d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x939d252bca5ba12e9f9653c68b1120d47e2c29fb13e41c1e3e2602f784877193",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallIdentitiy_1_d0g0v0_Metropolis" : {
+    "CallIdentitiy_1_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/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb69f",
-                    "hash" : "0x654667659e3bf550a59d02d105daa862c13d232818b3f60edeadff4fac04ab76",
-                    "mixHash" : "0x97013abc64104ea79d3412df0ab16e1a784bdfdab1a80d668381767ce7171834",
-                    "nonce" : "0x9af041581e16c1d0",
+                    "gasUsed" : "0x0115b3",
+                    "hash" : "0xddc95627518eac70b81d6e735a983e8944a36b907304739bb36ed00acebe1086",
+                    "mixHash" : "0xfedab7de6648872221e90206741834477f64dd173696eb8d9d15f9d6fd2dc5c9",
+                    "nonce" : "0x180d9aaf1e2d77b0",
                     "number" : "0x01",
                     "parentHash" : "0x023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7",
-                    "receiptTrie" : "0x8303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863",
-                    "stateRoot" : "0xb877206d69a879999a7ea34bc47146b73285e678a24da1872c1eb9ab59c781c9",
+                    "receiptTrie" : "0x1f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804f",
+                    "stateRoot" : "0x54377a0b82b46e5b3da88550b5988fd93b0b5dbbdab1ebc38db53b5b52a23517",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b877206d69a879999a7ea34bc47146b73285e678a24da1872c1eb9ab59c781c9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08303f32c0f453858c14f7aa1b322f68ec8f6359439426fc169f4032212c04863b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b69f8203e880a097013abc64104ea79d3412df0ab16e1a784bdfdab1a80d668381767ce7171834889af041581e16c1d0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0023411499419decc7ff9f22ee4ae698a461d50aba6531ad387ddab182eb6d0c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054377a0b82b46e5b3da88550b5988fd93b0b5dbbdab1ebc38db53b5b52a23517a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01f2877c6592c0fe1c2cf58026f5f1fb1d97f7c9fd6d4d9c8cb2367191f00804fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115b38203e880a0fedab7de6648872221e90206741834477f64dd173696eb8d9d15f9d6fd2dc5c988180d9aaf1e2d77b0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fca0a22f99fffc7704c463c996e354135cf031ac304770b0b1b9a844e8b9828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x654667659e3bf550a59d02d105daa862c13d232818b3f60edeadff4fac04ab76",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xddc95627518eac70b81d6e735a983e8944a36b907304739bb36ed00acebe1086",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b69f",
+                "balance" : "0x4563918244f515b3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c2c1",
+                "balance" : "0x0de0b6b3a76163ad",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0.json
index 7569476c1..ee2a4df58 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_1_nonzeroValue_d0g0v0_EIP150" : {
+    "CallIdentity_1_nonzeroValue_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/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x013273",
-                    "hash" : "0x31d2fce940f77d86ca16523215b66188084a66c6e5421cc69e5f2611d490b941",
-                    "mixHash" : "0x429e7ab4134de27ecc54ce4ab9c3d02ec4ea76d6a992101f7755a632d492b739",
-                    "nonce" : "0x3ec9eda1a2ba7c53",
+                    "hash" : "0x260ac6a04affa3fe7b87d21ca65e68ff06dcc1a847e14275ae0286bc7538a287",
+                    "mixHash" : "0x8351f4fad43b9c7ff6dd45151db27dfe1a294635e83813fc24e03edd698323d3",
+                    "nonce" : "0x93c31dd662045901",
                     "number" : "0x01",
                     "parentHash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
-                    "receiptTrie" : "0x2b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5",
-                    "stateRoot" : "0x1f9b886d62fd941083e2f911840ae2e9a9cc3261df5bebfdf373cdff84c27d1b",
+                    "receiptTrie" : "0x591b6bf0e12841ca1b839b6c5e3b48217ea569a5f1be6e3ce286ce64840f23ac",
+                    "stateRoot" : "0xe9b841866bbe1dadc4256fb5f20e4514c3c7497320d4baa9b1b9b420d1f13587",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f9b886d62fd941083e2f911840ae2e9a9cc3261df5bebfdf373cdff84c27d1ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a0429e7ab4134de27ecc54ce4ab9c3d02ec4ea76d6a992101f7755a632d492b739883ec9eda1a2ba7c53f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9b841866bbe1dadc4256fb5f20e4514c3c7497320d4baa9b1b9b420d1f13587a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0591b6bf0e12841ca1b839b6c5e3b48217ea569a5f1be6e3ce286ce64840f23acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a08351f4fad43b9c7ff6dd45151db27dfe1a294635e83813fc24e03edd698323d38893c31dd662045901f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31d2fce940f77d86ca16523215b66188084a66c6e5421cc69e5f2611d490b941",
-        "network" : "EIP150",
+        "lastblockhash" : "0x260ac6a04affa3fe7b87d21ca65e68ff06dcc1a847e14275ae0286bc7538a287",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x13",
@@ -72,6 +72,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed488d",
                 "code" : "0x60206000600060006013600462030d40f1600255600051600055",
@@ -112,10 +119,130 @@
             }
         }
     },
-    "CallIdentity_1_nonzeroValue_d0g0v0_EIP158" : {
+    "CallIdentity_1_nonzeroValue_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x013273",
+                    "hash" : "0x54c6b25b8b33e97c9f6c4912a37afe9abcd4f6c726eb324b092a0da6d0367d72",
+                    "mixHash" : "0xa3749cf41cbdd2618c669ef4f18b47c6fdf618626f0d0659d055c7a85140d7d1",
+                    "nonce" : "0xf7e6d7105e87dfec",
+                    "number" : "0x01",
+                    "parentHash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
+                    "receiptTrie" : "0x591b6bf0e12841ca1b839b6c5e3b48217ea569a5f1be6e3ce286ce64840f23ac",
+                    "stateRoot" : "0xe9b841866bbe1dadc4256fb5f20e4514c3c7497320d4baa9b1b9b420d1f13587",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9b841866bbe1dadc4256fb5f20e4514c3c7497320d4baa9b1b9b420d1f13587a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0591b6bf0e12841ca1b839b6c5e3b48217ea569a5f1be6e3ce286ce64840f23acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a0a3749cf41cbdd2618c669ef4f18b47c6fdf618626f0d0659d055c7a85140d7d188f7e6d7105e87dfecf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x54c6b25b8b33e97c9f6c4912a37afe9abcd4f6c726eb324b092a0da6d0367d72",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bed488d",
+                "code" : "0x60206000600060006013600462030d40f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53273",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76146ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bebc200",
+                "code" : "0x60206000600060006013600462030d40f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_1_nonzeroValue_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/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x013273",
-                    "hash" : "0x566b5302783e9417b20dc185ad0ff60783275857370187d89e053eff1de9d4b4",
-                    "mixHash" : "0x15ee64652b5bdee72cde7f12779d7ec441088f986a2e234a8f6af1279cf78450",
-                    "nonce" : "0x17291973fa7c1144",
+                    "hash" : "0x6cd2cc8ec7a04ce4065458d5a96e3b14afd152cdf293a27773c6f5c72e651876",
+                    "mixHash" : "0xfe1d9da4880077f342515024c1e755d16f9ff9061f29b1f1c3621e028d663f15",
+                    "nonce" : "0x71057d8de6039261",
                     "number" : "0x01",
                     "parentHash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
                     "receiptTrie" : "0x2b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f9b886d62fd941083e2f911840ae2e9a9cc3261df5bebfdf373cdff84c27d1ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a015ee64652b5bdee72cde7f12779d7ec441088f986a2e234a8f6af1279cf784508817291973fa7c1144f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f9b886d62fd941083e2f911840ae2e9a9cc3261df5bebfdf373cdff84c27d1ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a0fe1d9da4880077f342515024c1e755d16f9ff9061f29b1f1c3621e028d663f158871057d8de6039261f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x566b5302783e9417b20dc185ad0ff60783275857370187d89e053eff1de9d4b4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6cd2cc8ec7a04ce4065458d5a96e3b14afd152cdf293a27773c6f5c72e651876",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x13",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "CallIdentity_1_nonzeroValue_d0g0v0_Frontier" : {
+    "CallIdentity_1_nonzeroValue_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/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x012fdf",
-                    "hash" : "0xd4e8b437284843c5516a5beba180597e7d01a0dcb2d960188c502b6b869a7cec",
-                    "mixHash" : "0x60ec681464d6c46495a0f4d7aaeca74fb23ed64e08166f5ec2dcce092a822f0c",
-                    "nonce" : "0x320a4508aa3b1e10",
+                    "gasUsed" : "0x013273",
+                    "hash" : "0xa2da342a05667e01bd9afa4a67d87e1a67a13c298120f0ed27f4a257247268be",
+                    "mixHash" : "0xd64ba228a5ada27af08dad32fd458e523119f8ad6d5fb9c744e5f903f77abaad",
+                    "nonce" : "0x470d90c08cb53eb1",
                     "number" : "0x01",
                     "parentHash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
-                    "receiptTrie" : "0xe41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70ba",
-                    "stateRoot" : "0x9b41fa1f025e36a5025c4b0bf29d9997ac5ecfe5ea7f37e7d5f44a8da500bc71",
+                    "receiptTrie" : "0x2b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5",
+                    "stateRoot" : "0x1f9b886d62fd941083e2f911840ae2e9a9cc3261df5bebfdf373cdff84c27d1b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b41fa1f025e36a5025c4b0bf29d9997ac5ecfe5ea7f37e7d5f44a8da500bc71a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083012fdf8203e880a060ec681464d6c46495a0f4d7aaeca74fb23ed64e08166f5ec2dcce092a822f0c88320a4508aa3b1e10f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f9b886d62fd941083e2f911840ae2e9a9cc3261df5bebfdf373cdff84c27d1ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02b8bfe670d7b0e8c246caeb57f581bc079c8d5191b25b083c20b4d95f9da70c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a0d64ba228a5ada27af08dad32fd458e523119f8ad6d5fb9c744e5f903f77abaad88470d90c08cb53eb1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4e8b437284843c5516a5beba180597e7d01a0dcb2d960188c502b6b869a7cec",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa2da342a05667e01bd9afa4a67d87e1a67a13c298120f0ed27f4a257247268be",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x13",
@@ -307,14 +434,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52fdf",
+                "balance" : "0x4563918244f53273",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7614981",
+                "balance" : "0x0de0b6b3a76146ed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "CallIdentity_1_nonzeroValue_d0g0v0_Homestead" : {
+    "CallIdentity_1_nonzeroValue_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/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012fdf",
-                    "hash" : "0x0709c82daf5d7a65da4dc144466ad74617b57a9e141f42e2cc49bd31d3120ce1",
-                    "mixHash" : "0x1cf1da38de9971576cb95e40836c9db5907525f3ec8ee7f2aae46ae9dfe7484e",
-                    "nonce" : "0x86c2186851a8fcef",
+                    "hash" : "0x2e6dc92e11b197ba0f29c74c25082bfaca19d59cd40e0eea04a1ef4c8e747a2d",
+                    "mixHash" : "0x19994efc24384b6a8c69a7f2c2e12d82d740b43a251f68c5ec5027c1c1bd6559",
+                    "nonce" : "0x4795f8db47714804",
                     "number" : "0x01",
                     "parentHash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
                     "receiptTrie" : "0xe41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70ba",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b41fa1f025e36a5025c4b0bf29d9997ac5ecfe5ea7f37e7d5f44a8da500bc71a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083012fdf8203e880a01cf1da38de9971576cb95e40836c9db5907525f3ec8ee7f2aae46ae9dfe7484e8886c2186851a8fceff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b41fa1f025e36a5025c4b0bf29d9997ac5ecfe5ea7f37e7d5f44a8da500bc71a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083012fdf8203e880a019994efc24384b6a8c69a7f2c2e12d82d740b43a251f68c5ec5027c1c1bd6559884795f8db47714804f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0709c82daf5d7a65da4dc144466ad74617b57a9e141f42e2cc49bd31d3120ce1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2e6dc92e11b197ba0f29c74c25082bfaca19d59cd40e0eea04a1ef4c8e747a2d",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x13",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "CallIdentity_1_nonzeroValue_d0g0v0_Metropolis" : {
+    "CallIdentity_1_nonzeroValue_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/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x013273",
-                    "hash" : "0x84fa725011dd3580861cdf9b7459a5d4619b8a2701097833ce971127e79ffac5",
-                    "mixHash" : "0x00934da1b1339adfb80b30f9131e9a6d4631a0b07b0e9a03cea3c31e769427aa",
-                    "nonce" : "0xe40eaa37dc17a3f3",
+                    "gasUsed" : "0x012fdf",
+                    "hash" : "0x0587e8b6daf4a45dedd6b434da51c44a3b3af5ff5bf37ce8646c1960c9af413d",
+                    "mixHash" : "0x128e05ecccff181609c2c8440aa9038bda112d8537adf6f0c5241833aee31320",
+                    "nonce" : "0xae14d0e8d615f40f",
                     "number" : "0x01",
                     "parentHash" : "0xbcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6d",
-                    "receiptTrie" : "0x591b6bf0e12841ca1b839b6c5e3b48217ea569a5f1be6e3ce286ce64840f23ac",
-                    "stateRoot" : "0xe9b841866bbe1dadc4256fb5f20e4514c3c7497320d4baa9b1b9b420d1f13587",
+                    "receiptTrie" : "0xe41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70ba",
+                    "stateRoot" : "0x9b41fa1f025e36a5025c4b0bf29d9997ac5ecfe5ea7f37e7d5f44a8da500bc71",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9b841866bbe1dadc4256fb5f20e4514c3c7497320d4baa9b1b9b420d1f13587a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0591b6bf0e12841ca1b839b6c5e3b48217ea569a5f1be6e3ce286ce64840f23acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830132738203e880a000934da1b1339adfb80b30f9131e9a6d4631a0b07b0e9a03cea3c31e769427aa88e40eaa37dc17a3f3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bcc1027e9a21ae9b27ea8ba4dabae51d359eb4736cf48fef8d12a0ed7031ec6da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b41fa1f025e36a5025c4b0bf29d9997ac5ecfe5ea7f37e7d5f44a8da500bc71a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e41fbcbf5cd493ec24d1a2e83a107a0055e85edc4c18516397b3e010456b70bab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083012fdf8203e880a0128e05ecccff181609c2c8440aa9038bda112d8537adf6f0c5241833aee3132088ae14d0e8d615f40ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -514,8 +641,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddf6eb4597dfbcc2ffb1532fc992bf9eafad19c995de756ce44b3be502069bc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84fa725011dd3580861cdf9b7459a5d4619b8a2701097833ce971127e79ffac5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0587e8b6daf4a45dedd6b434da51c44a3b3af5ff5bf37ce8646c1960c9af413d",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x13",
@@ -524,13 +651,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed488d",
                 "code" : "0x60206000600060006013600462030d40f1600255600051600055",
@@ -540,14 +660,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53273",
+                "balance" : "0x4563918244f52fdf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76146ed",
+                "balance" : "0x0de0b6b3a7614981",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_2_d0g0v0.json
index dc88e720e..0458ef03d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_2_d0g0v0_EIP150" : {
+    "CallIdentity_2_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/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0152f1",
-                    "hash" : "0xa536093860c57cc074ec02cbfda4a679044a7f18ffd3a6dde274e1f09f4ff365",
-                    "mixHash" : "0xca7ccdc9e3d40c50b1383d03ec5b9e508795da96981a3b3694725818021f1596",
-                    "nonce" : "0x36c278cf343e7abb",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0xe8d3add4347611cb15ab534fb346c039715b58afdac876ecb463bc22e156da64",
+                    "mixHash" : "0x433d4d2a22c56431d185e2fbcb04b90aa7f80cd831d6af187facc752e94c1746",
+                    "nonce" : "0x5958f379e1711dce",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x8f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134",
-                    "stateRoot" : "0x1c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152f18203e880a0ca7ccdc9e3d40c50b1383d03ec5b9e508795da96981a3b3694725818021f15968836c278cf343e7abbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0433d4d2a22c56431d185e2fbcb04b90aa7f80cd831d6af187facc752e94c1746885958f379e1711dcef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa536093860c57cc074ec02cbfda4a679044a7f18ffd3a6dde274e1f09f4ff365",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe8d3add4347611cb15ab534fb346c039715b58afdac876ecb463bc22e156da64",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000004" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f552f1",
+                "balance" : "0x4563918244f4f149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761266f",
+                "balance" : "0x0de0b6b3a7618817",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallIdentity_2_d0g0v0_EIP158" : {
+    "CallIdentity_2_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/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xea3a15c8277696d98dfddd9eb863132b130412af06a2e2c8d081f05972fbb622",
-                    "mixHash" : "0xb126405ea2da7e86155cd9a2e2118e5e8fedc5c109ef338d263e44372e7d895a",
-                    "nonce" : "0x92a9b26997d7abd2",
+                    "hash" : "0xc32f73d89fefc51d6667381a719bab3ff00be4d266407376974ca2ade167f1a0",
+                    "mixHash" : "0x6910a9fb13683b2187f98126ccdf4b4a235498f54e01d724e33841e98460b39a",
+                    "nonce" : "0x8c29d7be938be7b1",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x2cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7d",
-                    "stateRoot" : "0x131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0b126405ea2da7e86155cd9a2e2118e5e8fedc5c109ef338d263e44372e7d895a8892a9b26997d7abd2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a06910a9fb13683b2187f98126ccdf4b4a235498f54e01d724e33841e98460b39a888c29d7be938be7b1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea3a15c8277696d98dfddd9eb863132b130412af06a2e2c8d081f05972fbb622",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc32f73d89fefc51d6667381a719bab3ff00be4d266407376974ca2ade167f1a0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallIdentity_2_d0g0v0_Frontier" : {
+    "CallIdentity_2_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/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01505d",
-                    "hash" : "0x53d433bae512d09bc2de99ca03311f87e685441bdf0993c1baa3b4f8f5b07269",
-                    "mixHash" : "0xfa3e5beefd84cbc0c1320882e3ee40b6ebfe36483a1bcb789eeb629253353231",
-                    "nonce" : "0xdf35fe4b3fa3240c",
+                    "gasUsed" : "0x0152f1",
+                    "hash" : "0xa3d353dd180c4ea7e8416e0e68bfa7e0a418d719702a4f13b2bddd9e3127cc94",
+                    "mixHash" : "0xd23d699fe1052bdc04ba939868031db54feeab374ab201267fcfcff678036ee6",
+                    "nonce" : "0xb15401c4fd445f7e",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14",
-                    "stateRoot" : "0x60535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984",
+                    "receiptTrie" : "0x8f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134",
+                    "stateRoot" : "0x1c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a0fa3e5beefd84cbc0c1320882e3ee40b6ebfe36483a1bcb789eeb62925335323188df35fe4b3fa3240cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152f18203e880a0d23d699fe1052bdc04ba939868031db54feeab374ab201267fcfcff678036ee688b15401c4fd445f7ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53d433bae512d09bc2de99ca03311f87e685441bdf0993c1baa3b4f8f5b07269",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa3d353dd180c4ea7e8416e0e68bfa7e0a418d719702a4f13b2bddd9e3127cc94",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5505d",
+                "balance" : "0x4563918244f552f1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612903",
+                "balance" : "0x0de0b6b3a761266f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallIdentity_2_d0g0v0_Homestead" : {
+    "CallIdentity_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x87fc4c8ec334b88d27e3e0f7aa655aa374c9dccd83db6af6e663f3630cea446e",
+                    "mixHash" : "0xdc9d7957c25ee97c36671623f9cec78954046ffafc2db0c36f1652c3e7e5e9de",
+                    "nonce" : "0xacba16ab73de522b",
+                    "number" : "0x01",
+                    "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
+                    "receiptTrie" : "0x2cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7d",
+                    "stateRoot" : "0x131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0dc9d7957c25ee97c36671623f9cec78954046ffafc2db0c36f1652c3e7e5e9de88acba16ab73de522bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x87fc4c8ec334b88d27e3e0f7aa655aa374c9dccd83db6af6e663f3630cea446e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf34578907f",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_2_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/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01505d",
-                    "hash" : "0x9feede073c0de136892abbce18a26ea3f6df021f929e14e2ecf5d1670ba6bb67",
-                    "mixHash" : "0x40818515532d22c054545a55b06456ae0a9e9621fa25316cf6699bcfcd174fe0",
-                    "nonce" : "0x82bc7a3fc104fc94",
+                    "hash" : "0x743854f9445c232abeda2fa9ee39e2801793b88fbe9426ff58cc9c7d3e80f9ac",
+                    "mixHash" : "0xbc2d448f95ffd7f6cddb502596613940ae6247fae6bc6d17251ad4c8fd8af394",
+                    "nonce" : "0x4038d8f617121b0b",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
                     "receiptTrie" : "0x640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a040818515532d22c054545a55b06456ae0a9e9621fa25316cf6699bcfcd174fe08882bc7a3fc104fc94f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a0bc2d448f95ffd7f6cddb502596613940ae6247fae6bc6d17251ad4c8fd8af394884038d8f617121b0bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9feede073c0de136892abbce18a26ea3f6df021f929e14e2ecf5d1670ba6bb67",
-        "network" : "Homestead",
+        "lastblockhash" : "0x743854f9445c232abeda2fa9ee39e2801793b88fbe9426ff58cc9c7d3e80f9ac",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallIdentity_2_d0g0v0_Metropolis" : {
+    "CallIdentity_2_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/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xee380bc943182e44577eef9ce1a4d3067d335efc3eb60534c1daa25552211c3e",
-                    "mixHash" : "0x55d1c7541f7d465e3d6ece9edd2342b6b8335966b28e2653448708dfe3bfabf8",
-                    "nonce" : "0x53f5b4949f6de2c4",
+                    "gasUsed" : "0x01505d",
+                    "hash" : "0xe50582bef04e594551b49bf00b456450c8c6ae5a331add3cdb6017005217a7fe",
+                    "mixHash" : "0x248a06bc16e32345646efa0668f7c8b889f35dc149b1a87c8d46cb0df05ac173",
+                    "nonce" : "0xe118c1ce11da26ed",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249",
+                    "receiptTrie" : "0x640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14",
+                    "stateRoot" : "0x60535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a055d1c7541f7d465e3d6ece9edd2342b6b8335966b28e2653448708dfe3bfabf88853f5b4949f6de2c4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a0248a06bc16e32345646efa0668f7c8b889f35dc149b1a87c8d46cb0df05ac17388e118c1ce11da26edf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee380bc943182e44577eef9ce1a4d3067d335efc3eb60534c1daa25552211c3e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe50582bef04e594551b49bf00b456450c8c6ae5a331add3cdb6017005217a7fe",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x4563918244f5505d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
+                "balance" : "0x0de0b6b3a7612903",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_3_d0g0v0.json
index 699e3ca1d..bcdcd1db2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_3_d0g0v0_EIP150" : {
+    "CallIdentity_3_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/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0152f1",
-                    "hash" : "0x2faf7dc8f892b9989c4390d38d6da84a35e0bf1cbf44c493ec026a0069ee6e6d",
-                    "mixHash" : "0x4bb0fa4d21d851a534144b630f48f2397e32071db804225ec43e988bf216b89b",
-                    "nonce" : "0x81cd142e2a1de7bd",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x8d1a1fbd321bf495fd1d5c6645ab6d793d54d623f8359d646ed945bafe57e479",
+                    "mixHash" : "0x7212a42d135bc1fab683b8d94ad195e4a13b158006446fcedaab9da086850863",
+                    "nonce" : "0xdb761b9c502c7569",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x8f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134",
-                    "stateRoot" : "0x1c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152f18203e880a04bb0fa4d21d851a534144b630f48f2397e32071db804225ec43e988bf216b89b8881cd142e2a1de7bdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a07212a42d135bc1fab683b8d94ad195e4a13b158006446fcedaab9da08685086388db761b9c502c7569f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2faf7dc8f892b9989c4390d38d6da84a35e0bf1cbf44c493ec026a0069ee6e6d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8d1a1fbd321bf495fd1d5c6645ab6d793d54d623f8359d646ed945bafe57e479",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000004" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f552f1",
+                "balance" : "0x4563918244f4f149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761266f",
+                "balance" : "0x0de0b6b3a7618817",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallIdentity_3_d0g0v0_EIP158" : {
+    "CallIdentity_3_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/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xc21d035dd6bf0b035bef7b48fe712183ff76b73b4e70e03d49bc8b01fc5a6435",
-                    "mixHash" : "0x685fed6670de3e8b3d2a7fa086edc3595dd7172199a515238195d509b641262f",
-                    "nonce" : "0x0f934a1e61aa8274",
+                    "hash" : "0xb3d64e3a2972ec186b731d3e1095029c74a97ba03642f59240052124ac98a0eb",
+                    "mixHash" : "0x489bad80c901caa38e3cddfbf6aeecc16cfac8c7e37505a367f103b0ab384e8a",
+                    "nonce" : "0x57aeaba32af97997",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x2cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7d",
-                    "stateRoot" : "0x131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0685fed6670de3e8b3d2a7fa086edc3595dd7172199a515238195d509b641262f880f934a1e61aa8274f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0489bad80c901caa38e3cddfbf6aeecc16cfac8c7e37505a367f103b0ab384e8a8857aeaba32af97997f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc21d035dd6bf0b035bef7b48fe712183ff76b73b4e70e03d49bc8b01fc5a6435",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb3d64e3a2972ec186b731d3e1095029c74a97ba03642f59240052124ac98a0eb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallIdentity_3_d0g0v0_Frontier" : {
+    "CallIdentity_3_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/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01505d",
-                    "hash" : "0x49a6ca2ded793e549ac437b29dac78b49b6bf3426bd276e77b21760e315876e3",
-                    "mixHash" : "0x40a815b7d37af03635abea6421f1f2322e9ca8283b0c99ab1e534e8ca90645b8",
-                    "nonce" : "0x822353b18f3f6ba1",
+                    "gasUsed" : "0x0152f1",
+                    "hash" : "0x3dba8b9f33d4ca3638e28b35d13a22ab87de46785ab15419d0f44d712bd6332a",
+                    "mixHash" : "0x7a88620eb9fa0b70007d52e9b6aaf99f29d6254b088e2cca37ffa7f803aef17f",
+                    "nonce" : "0xd2948756debd0515",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14",
-                    "stateRoot" : "0x60535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984",
+                    "receiptTrie" : "0x8f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134",
+                    "stateRoot" : "0x1c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a040a815b7d37af03635abea6421f1f2322e9ca8283b0c99ab1e534e8ca90645b888822353b18f3f6ba1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c95f8dfdeaf1f3235e439c8d3cdbbdbf23bc63a8d14c99a1a3ddf54da774fa8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f3ca313672d8d5c3cd30467f9a26ab6ec6c4e65c05a71ec4cdb7f712d784134b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152f18203e880a07a88620eb9fa0b70007d52e9b6aaf99f29d6254b088e2cca37ffa7f803aef17f88d2948756debd0515f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49a6ca2ded793e549ac437b29dac78b49b6bf3426bd276e77b21760e315876e3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3dba8b9f33d4ca3638e28b35d13a22ab87de46785ab15419d0f44d712bd6332a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5505d",
+                "balance" : "0x4563918244f552f1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612903",
+                "balance" : "0x0de0b6b3a761266f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallIdentity_3_d0g0v0_Homestead" : {
+    "CallIdentity_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0xbe584f622b07dd9563155c3d55e0e8ebccf3e15b748beb9e0b89abee1884dc09",
+                    "mixHash" : "0xa24e72ed5f1a27bb2be3125899afb95c2fbcf8a97b5f31b5864b44e451d9f3f9",
+                    "nonce" : "0xfe0e67a658cee659",
+                    "number" : "0x01",
+                    "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
+                    "receiptTrie" : "0x2cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7d",
+                    "stateRoot" : "0x131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0131aff66c513e89143bf8ded3c537dc5e500c33d919161232e19b2b5079ddbe4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02cf90503dbcd0617fb48824fcb74f7a7307153d700248907df416b424c8e5a7db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a0a24e72ed5f1a27bb2be3125899afb95c2fbcf8a97b5f31b5864b44e451d9f3f988fe0e67a658cee659f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe584f622b07dd9563155c3d55e0e8ebccf3e15b748beb9e0b89abee1884dc09",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf34578907f",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_3_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/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01505d",
-                    "hash" : "0x6bf652e96458a54b72591624ea409b5b481e5c506b732f51f196c1b68e2965db",
-                    "mixHash" : "0x37481242fc8c05927069444abbdd19d561cd5ae8e8d3c718cc3ef1d53c92edaa",
-                    "nonce" : "0x797ac5ecff8330e3",
+                    "hash" : "0x7bd93534a4fbb1ed710d0ac31de9bce0b73341d816be469d709be2327e8902a6",
+                    "mixHash" : "0xc9a258f4978be58291df7f0505d329d3fa2b416ba23041d0a926b241e95b472a",
+                    "nonce" : "0x2ad4d8813a77f433",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
                     "receiptTrie" : "0x640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a037481242fc8c05927069444abbdd19d561cd5ae8e8d3c718cc3ef1d53c92edaa88797ac5ecff8330e3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a0c9a258f4978be58291df7f0505d329d3fa2b416ba23041d0a926b241e95b472a882ad4d8813a77f433f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bf652e96458a54b72591624ea409b5b481e5c506b732f51f196c1b68e2965db",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7bd93534a4fbb1ed710d0ac31de9bce0b73341d816be469d709be2327e8902a6",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallIdentity_3_d0g0v0_Metropolis" : {
+    "CallIdentity_3_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/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xea1afb820c320556d2be2e49c9d446c1abfc0ca9b5acb0ed563f29d8ed22387a",
-                    "mixHash" : "0x28932cbec1768414cf1de7c4670d1cfbc6235e3d95bd98325f86fd8f84d68955",
-                    "nonce" : "0xc6d732125e81e415",
+                    "gasUsed" : "0x01505d",
+                    "hash" : "0xa4817b483b6ae70f5d2d65c3418be6a918af8ebf297d2274c2c45d0c6244fa34",
+                    "mixHash" : "0x8bbcf1fbd6f60db49533b466c3862c33d4bff7927e7c4a39d6bee5e3fe0fe1c3",
+                    "nonce" : "0x3c2b2f3271fbc585",
                     "number" : "0x01",
                     "parentHash" : "0xe41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63f",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249",
+                    "receiptTrie" : "0x640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14",
+                    "stateRoot" : "0x60535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b857be12cdc2a24f73b8c8639e90ab690aa001149c46db5b38e5586de532249a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1498203e880a028932cbec1768414cf1de7c4670d1cfbc6235e3d95bd98325f86fd8f84d6895588c6d732125e81e415f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e41726bd82d5de8435bc1e68bdcb4f10ccaf7ec0e8e3c25bbc3f4108a45ce63fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060535481cbb68835ea456dd6ce844a251b2242eaba46fc05e4b6719ba3b5b984a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0640382bd0af6f20f0e3b8f417f5995feadf557385680c32bf0129d22d5bace14b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301505d8203e880a08bbcf1fbd6f60db49533b466c3862c33d4bff7927e7c4a39d6bee5e3fe0fe1c3883c2b2f3271fbc585f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d75bf2c7d1b23c1534236e6225ff94cbdf4a11a5eeaececb5720df7288b026cca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea1afb820c320556d2be2e49c9d446c1abfc0ca9b5acb0ed563f29d8ed22387a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa4817b483b6ae70f5d2d65c3418be6a918af8ebf297d2274c2c45d0c6244fa34",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x4563918244f5505d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
+                "balance" : "0x0de0b6b3a7612903",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_d0g0v0.json
index d78660b95..1fd385f32 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_4_d0g0v0_EIP150" : {
+    "CallIdentity_4_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/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0152eb",
-                    "hash" : "0x40d1bc8d1c420c8da0d2c291f3ad479fc401808b1c38740ad6b5c6161719334e",
-                    "mixHash" : "0x882ebabc75c234a8dca8c61342a3704c64b0f57ea6fc9fbe4ce2607a51ef98df",
-                    "nonce" : "0x155b1c1fc79d650a",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0xe5ec5beff7f5406aa647b4182f341d61d78ca958b537e234cd3ac1cc834ac1e7",
+                    "mixHash" : "0x55a022d936d37016e666fffdeff6208343a304ec7fe1f639ac732bf5258b14f2",
+                    "nonce" : "0x17bfffc0e3f82cef",
                     "number" : "0x01",
                     "parentHash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
-                    "receiptTrie" : "0xd1bde63ab1eedacd4e65dc4aa0c792ae57c63b242f3a333b3bfa590b9ca12779",
-                    "stateRoot" : "0x921536a0b4ae1fece91dac56771f44000e129050f02db4ec4bb9666d852f8fb1",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0x75bb168cfa69a88c49e9686e1329e0d19b4a4ed31088a74208629ff5c8b90d77",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0921536a0b4ae1fece91dac56771f44000e129050f02db4ec4bb9666d852f8fb1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d1bde63ab1eedacd4e65dc4aa0c792ae57c63b242f3a333b3bfa590b9ca12779b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152eb8203e880a0882ebabc75c234a8dca8c61342a3704c64b0f57ea6fc9fbe4ce2607a51ef98df88155b1c1fc79d650af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075bb168cfa69a88c49e9686e1329e0d19b4a4ed31088a74208629ff5c8b90d77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a055a022d936d37016e666fffdeff6208343a304ec7fe1f639ac732bf5258b14f28817bfffc0e3f82ceff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40d1bc8d1c420c8da0d2c291f3ad479fc401808b1c38740ad6b5c6161719334e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe5ec5beff7f5406aa647b4182f341d61d78ca958b537e234cd3ac1cc834ac1e7",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000004" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f552eb",
+                "balance" : "0x4563918244f4f143",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612675",
+                "balance" : "0x0de0b6b3a761881d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallIdentity_4_d0g0v0_EIP158" : {
+    "CallIdentity_4_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/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0xa8ce51d27b737b232354297c94d3f051349f2caccd889dcbef512dee506bc0e6",
-                    "mixHash" : "0x6467a61589e677ccc5c771d09079933a749aca035bfcc362b2f1ac176a58bb3a",
-                    "nonce" : "0xfc901b5e27f30ab8",
+                    "hash" : "0x6dfc4878f0afaaa42348b76612fce50038f29b25eb156a64f3c47313a786bcf8",
+                    "mixHash" : "0x4d075af5b690eafea701704ec90d1ba7dada797e8fc881a6e316564e70ceff0f",
+                    "nonce" : "0xbd186d8ff996d281",
                     "number" : "0x01",
                     "parentHash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
-                    "receiptTrie" : "0xdcb393740acdfef7ec35e3ff2030d865494a3bd7316e386104ef88e9d79db0d0",
-                    "stateRoot" : "0x1e8c69e47f9d63e80ce335902990c23fdd5fb81d8a62189b970144a033376a01",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0x75bb168cfa69a88c49e9686e1329e0d19b4a4ed31088a74208629ff5c8b90d77",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e8c69e47f9d63e80ce335902990c23fdd5fb81d8a62189b970144a033376a01a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0dcb393740acdfef7ec35e3ff2030d865494a3bd7316e386104ef88e9d79db0d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a06467a61589e677ccc5c771d09079933a749aca035bfcc362b2f1ac176a58bb3a88fc901b5e27f30ab8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075bb168cfa69a88c49e9686e1329e0d19b4a4ed31088a74208629ff5c8b90d77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a04d075af5b690eafea701704ec90d1ba7dada797e8fc881a6e316564e70ceff0f88bd186d8ff996d281f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8ce51d27b737b232354297c94d3f051349f2caccd889dcbef512dee506bc0e6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6dfc4878f0afaaa42348b76612fce50038f29b25eb156a64f3c47313a786bcf8",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallIdentity_4_d0g0v0_Frontier" : {
+    "CallIdentity_4_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/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015057",
-                    "hash" : "0x4b2f87fcfd569784b19d4b8b43156bb47073e1325ce201abc049d4d4218c63bc",
-                    "mixHash" : "0xa9cdf983b49abdc0401d3b9babd658796e04d4ff7d5f87a614195d3d77b595a6",
-                    "nonce" : "0x332ce659a4d9092d",
+                    "gasUsed" : "0x0152eb",
+                    "hash" : "0x6a1548f6e61911b8dadac7a11dec1803218a293ff8959a415e1162a7b3e5aff6",
+                    "mixHash" : "0x53acd4af8b000bb28505ddf4d4317b95405415944a26b2698a073c1bf6931fa5",
+                    "nonce" : "0x256ee09fc0fe3e2f",
                     "number" : "0x01",
                     "parentHash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
-                    "receiptTrie" : "0x4c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7f",
-                    "stateRoot" : "0xd324b7a3633793560da78958fce20128e8bc4e6c7fc24629c1f357cb309cf1f2",
+                    "receiptTrie" : "0xd1bde63ab1eedacd4e65dc4aa0c792ae57c63b242f3a333b3bfa590b9ca12779",
+                    "stateRoot" : "0x921536a0b4ae1fece91dac56771f44000e129050f02db4ec4bb9666d852f8fb1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d324b7a3633793560da78958fce20128e8bc4e6c7fc24629c1f357cb309cf1f2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a0a9cdf983b49abdc0401d3b9babd658796e04d4ff7d5f87a614195d3d77b595a688332ce659a4d9092df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0921536a0b4ae1fece91dac56771f44000e129050f02db4ec4bb9666d852f8fb1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d1bde63ab1eedacd4e65dc4aa0c792ae57c63b242f3a333b3bfa590b9ca12779b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152eb8203e880a053acd4af8b000bb28505ddf4d4317b95405415944a26b2698a073c1bf6931fa588256ee09fc0fe3e2ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b2f87fcfd569784b19d4b8b43156bb47073e1325ce201abc049d4d4218c63bc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6a1548f6e61911b8dadac7a11dec1803218a293ff8959a415e1162a7b3e5aff6",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55057",
+                "balance" : "0x4563918244f552eb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612909",
+                "balance" : "0x0de0b6b3a7612675",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallIdentity_4_d0g0v0_Homestead" : {
+    "CallIdentity_4_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0xb802031ea7146e3b16390f78cb66b56d58b0eea7ae162abfc813dfe7541ad621",
+                    "mixHash" : "0xa9a781ceb312b35b1f5d5d14cb3ef18ea646b64a49c1f088d074db0c61345273",
+                    "nonce" : "0xf4eb17761bc73f20",
+                    "number" : "0x01",
+                    "parentHash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
+                    "receiptTrie" : "0xdcb393740acdfef7ec35e3ff2030d865494a3bd7316e386104ef88e9d79db0d0",
+                    "stateRoot" : "0x1e8c69e47f9d63e80ce335902990c23fdd5fb81d8a62189b970144a033376a01",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e8c69e47f9d63e80ce335902990c23fdd5fb81d8a62189b970144a033376a01a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0dcb393740acdfef7ec35e3ff2030d865494a3bd7316e386104ef88e9d79db0d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0a9a781ceb312b35b1f5d5d14cb3ef18ea646b64a49c1f088d074db0c6134527388f4eb17761bc73f20f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb802031ea7146e3b16390f78cb66b56d58b0eea7ae162abfc813dfe7541ad621",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f143",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761881d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_4_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/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015057",
-                    "hash" : "0xbd3e80418e8298408610505442361624129a333d74a8fc56f09d868fdcf51eb0",
-                    "mixHash" : "0xedaa091b90359000fbd290716507f495405d6c7d7b5a8bc8f7f5702d27add9e8",
-                    "nonce" : "0x9f858e45bf7e5c73",
+                    "hash" : "0x710517c19eddbe0901fab81fbb376b9e9795b003cdcccb261ba488d1d78d13e7",
+                    "mixHash" : "0xb3a9b83c78ff421e07336ce5b4553735d6cf5c2df050a5cfbed30729a45dba40",
+                    "nonce" : "0x64d52d62b3b2e2cc",
                     "number" : "0x01",
                     "parentHash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
                     "receiptTrie" : "0x4c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7f",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d324b7a3633793560da78958fce20128e8bc4e6c7fc24629c1f357cb309cf1f2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a0edaa091b90359000fbd290716507f495405d6c7d7b5a8bc8f7f5702d27add9e8889f858e45bf7e5c73f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d324b7a3633793560da78958fce20128e8bc4e6c7fc24629c1f357cb309cf1f2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a0b3a9b83c78ff421e07336ce5b4553735d6cf5c2df050a5cfbed30729a45dba408864d52d62b3b2e2ccf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd3e80418e8298408610505442361624129a333d74a8fc56f09d868fdcf51eb0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x710517c19eddbe0901fab81fbb376b9e9795b003cdcccb261ba488d1d78d13e7",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallIdentity_4_d0g0v0_Metropolis" : {
+    "CallIdentity_4_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/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf143",
-                    "hash" : "0x503d9e3a272344ae25eac1576697ded517d7970ae5e0ff3c33017f106dc3e536",
-                    "mixHash" : "0x8f79f3052ec21b51ccf8eee32ef73c2e1d3dd391833d2324198c51c759b12aac",
-                    "nonce" : "0xf95aae4738978efc",
+                    "gasUsed" : "0x015057",
+                    "hash" : "0xc6adfc7dfad17b9ca023d42322c1fee19d6732813da6d7020fa7f836b7c04d31",
+                    "mixHash" : "0x5d2b0b078897a4ab8365b5b56e8dfd961b74b0424345867a3b7c5687e2caedea",
+                    "nonce" : "0x4705debdf24bf5ce",
                     "number" : "0x01",
                     "parentHash" : "0x411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094",
-                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
-                    "stateRoot" : "0x75bb168cfa69a88c49e9686e1329e0d19b4a4ed31088a74208629ff5c8b90d77",
+                    "receiptTrie" : "0x4c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7f",
+                    "stateRoot" : "0xd324b7a3633793560da78958fce20128e8bc4e6c7fc24629c1f357cb309cf1f2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075bb168cfa69a88c49e9686e1329e0d19b4a4ed31088a74208629ff5c8b90d77a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a08f79f3052ec21b51ccf8eee32ef73c2e1d3dd391833d2324198c51c759b12aac88f95aae4738978efcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0411bee646659669a996fcd5b068f7dd6c039f5f7444e6fc43ed2f5646a6f1094a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d324b7a3633793560da78958fce20128e8bc4e6c7fc24629c1f357cb309cf1f2a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04c664f9f5167ccab31b86e5d89f6901c07d7edc25d1c3c3c8e4b6b7a88ad7c7fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a05d2b0b078897a4ab8365b5b56e8dfd961b74b0424345867a3b7c5687e2caedea884705debdf24bf5cef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7ab1a780e9530f889fcf3f68451a44087d809b959fe9685c03dab43cff1e01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x503d9e3a272344ae25eac1576697ded517d7970ae5e0ff3c33017f106dc3e536",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc6adfc7dfad17b9ca023d42322c1fee19d6732813da6d7020fa7f836b7c04d31",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f143",
+                "balance" : "0x4563918244f55057",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761881d",
+                "balance" : "0x0de0b6b3a7612909",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0.json
index 2ecb821d2..8e8d68125 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_4_gas17_d0g0v0_EIP150" : {
+    "CallIdentity_4_gas17_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/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011852",
-                    "hash" : "0xc9a8bba3f8feb01c6f8e82f7c37e51c129b3b64a677abf9a27fe876fead5dfa7",
-                    "mixHash" : "0x8d65cee507cc93980ee2e0ef7c834a93b73954c0ec4b8a6a10de090e05dc4c8b",
-                    "nonce" : "0x5873e6ea727d3185",
+                    "gasUsed" : "0xb6aa",
+                    "hash" : "0x30053f8eb2c71780d01d2794ddb72168a934d81f50a771f05c9376a780aef41f",
+                    "mixHash" : "0xa3818efdfcbb3851494e4a860474f36195d951c279c249dfd346dc6ab5ecd9c5",
+                    "nonce" : "0x051103c76a926fa0",
                     "number" : "0x01",
                     "parentHash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
-                    "receiptTrie" : "0x7616634a5a0f1c85b8b412702a8c8bbed5eefcb7de4651f4a85a50122b220951",
-                    "stateRoot" : "0xb6f4fdff0e5e1612b84a90b3e6354de9b8a4904aea51007ca4a721c5e0e91708",
+                    "receiptTrie" : "0x6fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825",
+                    "stateRoot" : "0x61eea0cf29972e6d5dd88f65fc2215286cc052e3d531dd2565b956f7bbe6248f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6f4fdff0e5e1612b84a90b3e6354de9b8a4904aea51007ca4a721c5e0e91708a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07616634a5a0f1c85b8b412702a8c8bbed5eefcb7de4651f4a85a50122b220951b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830118528203e880a08d65cee507cc93980ee2e0ef7c834a93b73954c0ec4b8a6a10de090e05dc4c8b885873e6ea727d3185f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061eea0cf29972e6d5dd88f65fc2215286cc052e3d531dd2565b956f7bbe6248fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a0a3818efdfcbb3851494e4a860474f36195d951c279c249dfd346dc6ab5ecd9c588051103c76a926fa0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9a8bba3f8feb01c6f8e82f7c37e51c129b3b64a677abf9a27fe876fead5dfa7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x30053f8eb2c71780d01d2794ddb72168a934d81f50a771f05c9376a780aef41f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51852",
+                "balance" : "0x4563918244f4b6aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761610e",
+                "balance" : "0x0de0b6b3a761c2b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CallIdentity_4_gas17_d0g0v0_EIP158" : {
+    "CallIdentity_4_gas17_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/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb6aa",
-                    "hash" : "0x226e152f73b1c4b54e826dbaf57c2c86fa812a8b50d1c02c6e54b1045236f7a8",
-                    "mixHash" : "0x11f14ca54704d1783674a4db7fbb13b472646970fd02418e45c4a82b128e9999",
-                    "nonce" : "0x30b2c3a09451d4c3",
+                    "hash" : "0x911ee9603b25f27a409b953b4445c82ebf83cffebeb7ee2b84820ae7dd77e993",
+                    "mixHash" : "0x5545826f0f22cd976c777ea5d90c72c5cdb01e173fcc417d76d387679f430903",
+                    "nonce" : "0xac1e8894c23b9fab",
                     "number" : "0x01",
                     "parentHash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
-                    "receiptTrie" : "0xc2aeb342c92c86ec2dfc48244840975c6739cc7d13de7df61e1712d2aed0e75d",
-                    "stateRoot" : "0x7b6a22636cf7f61fc9e6a553832e0eaa35f8d9bab0307005a0037e0b5a149277",
+                    "receiptTrie" : "0x6fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825",
+                    "stateRoot" : "0x61eea0cf29972e6d5dd88f65fc2215286cc052e3d531dd2565b956f7bbe6248f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b6a22636cf7f61fc9e6a553832e0eaa35f8d9bab0307005a0037e0b5a149277a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c2aeb342c92c86ec2dfc48244840975c6739cc7d13de7df61e1712d2aed0e75db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a011f14ca54704d1783674a4db7fbb13b472646970fd02418e45c4a82b128e99998830b2c3a09451d4c3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061eea0cf29972e6d5dd88f65fc2215286cc052e3d531dd2565b956f7bbe6248fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a05545826f0f22cd976c777ea5d90c72c5cdb01e173fcc417d76d387679f43090388ac1e8894c23b9fabf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x226e152f73b1c4b54e826dbaf57c2c86fa812a8b50d1c02c6e54b1045236f7a8",
-        "network" : "EIP158",
+        "lastblockhash" : "0x911ee9603b25f27a409b953b4445c82ebf83cffebeb7ee2b84820ae7dd77e993",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CallIdentity_4_gas17_d0g0v0_Frontier" : {
+    "CallIdentity_4_gas17_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/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0115be",
-                    "hash" : "0x3496daa7ff117df346cbbefd7bcffa7133f2434718ed066f238b39cb1224cffd",
-                    "mixHash" : "0x946b9d18b4c22a07cc952432b6490a6d4c3111d47d29e328b90391fa52a8e0ba",
-                    "nonce" : "0xb9505647a152cc84",
+                    "gasUsed" : "0x011852",
+                    "hash" : "0x92317741d016ad98b167dd1d06ce3431057f70cb7a86639073720c24e9dbce24",
+                    "mixHash" : "0xe465bf900e5bb6ef9357e81269e4df30553d914e1881c1d26e37c77beb6a0941",
+                    "nonce" : "0x93cd913d4d44d6bd",
                     "number" : "0x01",
                     "parentHash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
-                    "receiptTrie" : "0x82ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0af",
-                    "stateRoot" : "0x938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4a",
+                    "receiptTrie" : "0x7616634a5a0f1c85b8b412702a8c8bbed5eefcb7de4651f4a85a50122b220951",
+                    "stateRoot" : "0xb6f4fdff0e5e1612b84a90b3e6354de9b8a4904aea51007ca4a721c5e0e91708",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba082ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115be8203e880a0946b9d18b4c22a07cc952432b6490a6d4c3111d47d29e328b90391fa52a8e0ba88b9505647a152cc84f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6f4fdff0e5e1612b84a90b3e6354de9b8a4904aea51007ca4a721c5e0e91708a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07616634a5a0f1c85b8b412702a8c8bbed5eefcb7de4651f4a85a50122b220951b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830118528203e880a0e465bf900e5bb6ef9357e81269e4df30553d914e1881c1d26e37c77beb6a09418893cd913d4d44d6bdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3496daa7ff117df346cbbefd7bcffa7133f2434718ed066f238b39cb1224cffd",
-        "network" : "Frontier",
+        "lastblockhash" : "0x92317741d016ad98b167dd1d06ce3431057f70cb7a86639073720c24e9dbce24",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f515be",
+                "balance" : "0x4563918244f51852",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76163a2",
+                "balance" : "0x0de0b6b3a761610e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CallIdentity_4_gas17_d0g0v0_Homestead" : {
+    "CallIdentity_4_gas17_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/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0115be",
-                    "hash" : "0x4a5fb676458b44d3d12ae901cabe426f2ed0142071f0af3a76886015f06f7b01",
-                    "mixHash" : "0x1811572089f0d8ced5106c01f720fa2bfd818dd69971c5a548488575961eea4f",
-                    "nonce" : "0xe234a34af0129fbf",
+                    "gasUsed" : "0xb6aa",
+                    "hash" : "0x54015c2bed63d4193ba7ae9ef8a622ddea9d085915f1220741710f7faae08cad",
+                    "mixHash" : "0x15c8054c38a6b2fa195283bd1c8761b9bb00c7f7a1a7bfc43f0061cda4ebb5e7",
+                    "nonce" : "0x1f25db6d201015b9",
                     "number" : "0x01",
                     "parentHash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
-                    "receiptTrie" : "0x82ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0af",
-                    "stateRoot" : "0x938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4a",
+                    "receiptTrie" : "0xc2aeb342c92c86ec2dfc48244840975c6739cc7d13de7df61e1712d2aed0e75d",
+                    "stateRoot" : "0x7b6a22636cf7f61fc9e6a553832e0eaa35f8d9bab0307005a0037e0b5a149277",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba082ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115be8203e880a01811572089f0d8ced5106c01f720fa2bfd818dd69971c5a548488575961eea4f88e234a34af0129fbff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b6a22636cf7f61fc9e6a553832e0eaa35f8d9bab0307005a0037e0b5a149277a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c2aeb342c92c86ec2dfc48244840975c6739cc7d13de7df61e1712d2aed0e75db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a015c8054c38a6b2fa195283bd1c8761b9bb00c7f7a1a7bfc43f0061cda4ebb5e7881f25db6d201015b9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a5fb676458b44d3d12ae901cabe426f2ed0142071f0af3a76886015f06f7b01",
-        "network" : "Homestead",
+        "lastblockhash" : "0x54015c2bed63d4193ba7ae9ef8a622ddea9d085915f1220741710f7faae08cad",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f515be",
+                "balance" : "0x4563918244f4b6aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76163a2",
+                "balance" : "0x0de0b6b3a761c2b6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CallIdentity_4_gas17_d0g0v0_Metropolis" : {
+    "CallIdentity_4_gas17_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/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb6aa",
-                    "hash" : "0xbfe2d191a978794e01fdd333ec048af56d206d054cdba13988f646cc89071fcd",
-                    "mixHash" : "0x98147568ba39fc5376005486646677066ad6ddc0f5a6dba0b4e807e44ce65ad8",
-                    "nonce" : "0xb21f7b950b2022ec",
+                    "gasUsed" : "0x0115be",
+                    "hash" : "0x787b3cf59119a2df6567d191987d156817731312e4fdf438825b652dad41ebf6",
+                    "mixHash" : "0x0ced0b2bf67ee2992736ec757bf896401dc91eea3e7d740061f5cdc7698ad1e7",
+                    "nonce" : "0xb3e4fc12f4469971",
                     "number" : "0x01",
                     "parentHash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
-                    "receiptTrie" : "0x6fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825",
-                    "stateRoot" : "0x61eea0cf29972e6d5dd88f65fc2215286cc052e3d531dd2565b956f7bbe6248f",
+                    "receiptTrie" : "0x82ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0af",
+                    "stateRoot" : "0x938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061eea0cf29972e6d5dd88f65fc2215286cc052e3d531dd2565b956f7bbe6248fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06fb4d94579a2151e5ee46899f271161c43aa58826a0ef473415be08275efa825b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b6aa8203e880a098147568ba39fc5376005486646677066ad6ddc0f5a6dba0b4e807e44ce65ad888b21f7b950b2022ecf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba082ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115be8203e880a00ced0b2bf67ee2992736ec757bf896401dc91eea3e7d740061f5cdc7698ad1e788b3e4fc12f4469971f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfe2d191a978794e01fdd333ec048af56d206d054cdba13988f646cc89071fcd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x787b3cf59119a2df6567d191987d156817731312e4fdf438825b652dad41ebf6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f515be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76163a2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_4_gas17_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0115be",
+                    "hash" : "0x0950e27a7292cc3f6f890b7ba1c446e062509901858b2296d45a56a56bd1a79c",
+                    "mixHash" : "0x3bbcffaaf9f979ba48e2921891c7ab0fd46c4b7694c28e089539038c4eea4e74",
+                    "nonce" : "0x8628819ad3074a48",
+                    "number" : "0x01",
+                    "parentHash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
+                    "receiptTrie" : "0x82ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0af",
+                    "stateRoot" : "0x938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0aff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938f38d8b59105a80ba91ff77fb3b5fb4199faaf16646243e316de46a7025c4aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba082ac15bc3c3bd265871b5dfa63dddef7da82c082faa0c488eeb567d7fec7d0afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830115be8203e880a03bbcffaaf9f979ba48e2921891c7ab0fd46c4b7694c28e089539038c4eea4e74888628819ad3074a48f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xaff3e71e431d5cd268328e1911d1ffc911a2f5e8204fb319753662428092560f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x66ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066ba9574bb912bef83ad9dd7722e968c2facf620a8770d317f66864dd6638cfea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0950e27a7292cc3f6f890b7ba1c446e062509901858b2296d45a56a56bd1a79c",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b6aa",
+                "balance" : "0x4563918244f515be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761c2b6",
+                "balance" : "0x0de0b6b3a76163a2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0.json
index 05ac8978b..7e3e8a2b4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_4_gas18_d0g0v0_EIP150" : {
+    "CallIdentity_4_gas18_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/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0152eb",
-                    "hash" : "0x5c42f35489e2dbd5ef69776450b5c839871c0d92a0d505bcde0bac3a90f4d32a",
-                    "mixHash" : "0x6c0d2740dcfb207c7a478219c7bc8812919229cb9c6e6992c7e90214e725860b",
-                    "nonce" : "0x191704582ef31283",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x1d0add153ca487737f3a0d580d5b459be3c989313b624c911a3827c2af0bff57",
+                    "mixHash" : "0xba04495e5ee338f11eabd0d2043fb06088dc981473d2d19a8094715d01ad254e",
+                    "nonce" : "0x7f073eefc220c2c3",
                     "number" : "0x01",
                     "parentHash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
-                    "receiptTrie" : "0x4c22ec0c6017d93439471236440ae1fbc060069c492c9794654402e1918069d3",
-                    "stateRoot" : "0x291a28da7cafebeb74d00680bc8cc1523cce7ef48dce4e7555ca5e06fa1fe678",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0xa62c574b101048e51bdb739447cab9da74a938e23cc33aee4572b388a5a07ea1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0291a28da7cafebeb74d00680bc8cc1523cce7ef48dce4e7555ca5e06fa1fe678a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04c22ec0c6017d93439471236440ae1fbc060069c492c9794654402e1918069d3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152eb8203e880a06c0d2740dcfb207c7a478219c7bc8812919229cb9c6e6992c7e90214e725860b88191704582ef31283f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a62c574b101048e51bdb739447cab9da74a938e23cc33aee4572b388a5a07ea1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0ba04495e5ee338f11eabd0d2043fb06088dc981473d2d19a8094715d01ad254e887f073eefc220c2c3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c42f35489e2dbd5ef69776450b5c839871c0d92a0d505bcde0bac3a90f4d32a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1d0add153ca487737f3a0d580d5b459be3c989313b624c911a3827c2af0bff57",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000004" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f552eb",
+                "balance" : "0x4563918244f4f143",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612675",
+                "balance" : "0x0de0b6b3a761881d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallIdentity_4_gas18_d0g0v0_EIP158" : {
+    "CallIdentity_4_gas18_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/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0xdd1f18f2af5be89bd6e5d9aa196dd4dc50b0a7bac50f1a7921d5cfba53e6ed07",
-                    "mixHash" : "0x3a5d3078db66933b1f917648102bd2b3b18ebf374e536942cc257c665ea78915",
-                    "nonce" : "0x6f15bc2c6f7fd5da",
+                    "hash" : "0x0519f0f6ca2c24bcfb9771c0624e8b09fef8fde98b3403ca88b3d598c9f19238",
+                    "mixHash" : "0x7716278bf9b379af120346b4ea03fb6daee0e455fb0507bb24cf0f2348cb8371",
+                    "nonce" : "0x0cc8d3246a3b4a4a",
                     "number" : "0x01",
                     "parentHash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
-                    "receiptTrie" : "0xe51e587ae000fbe334f34385eeb0306659e8888ea18863d154679c4ad9e074da",
-                    "stateRoot" : "0x315f68ece7f373370bdc9b3f7fd3ff84bae9cf134fc8bc2173354e6b2ecd6086",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0xa62c574b101048e51bdb739447cab9da74a938e23cc33aee4572b388a5a07ea1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0315f68ece7f373370bdc9b3f7fd3ff84bae9cf134fc8bc2173354e6b2ecd6086a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e51e587ae000fbe334f34385eeb0306659e8888ea18863d154679c4ad9e074dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a03a5d3078db66933b1f917648102bd2b3b18ebf374e536942cc257c665ea78915886f15bc2c6f7fd5daf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a62c574b101048e51bdb739447cab9da74a938e23cc33aee4572b388a5a07ea1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a07716278bf9b379af120346b4ea03fb6daee0e455fb0507bb24cf0f2348cb8371880cc8d3246a3b4a4af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd1f18f2af5be89bd6e5d9aa196dd4dc50b0a7bac50f1a7921d5cfba53e6ed07",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0519f0f6ca2c24bcfb9771c0624e8b09fef8fde98b3403ca88b3d598c9f19238",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallIdentity_4_gas18_d0g0v0_Frontier" : {
+    "CallIdentity_4_gas18_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/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015057",
-                    "hash" : "0xf902f73ccbd397539a4bd4c9927fa9a137e42906079bed94cd92edac540e1cda",
-                    "mixHash" : "0x018c1c4a19d9c3aa2746736e13023cf8cfc890f8c72fdd5bcf0adb446c080cb6",
-                    "nonce" : "0xb8a6b2678033f4b6",
+                    "gasUsed" : "0x0152eb",
+                    "hash" : "0x8e7ea97843c37becdd0e0a66aa1333c401a4dfee3978267595d30ed2e0e6129b",
+                    "mixHash" : "0xfe9fd69d8087edf25007bb90323a76b05df183e8e577b99de9c3ee422ff47649",
+                    "nonce" : "0x63fa75ddc085fdc2",
                     "number" : "0x01",
                     "parentHash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
-                    "receiptTrie" : "0x0e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5",
-                    "stateRoot" : "0x94b6ea9c6fe69c1eba1d3580da3e82d255e09d6a18c44eac1041b2622559f1e3",
+                    "receiptTrie" : "0x4c22ec0c6017d93439471236440ae1fbc060069c492c9794654402e1918069d3",
+                    "stateRoot" : "0x291a28da7cafebeb74d00680bc8cc1523cce7ef48dce4e7555ca5e06fa1fe678",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094b6ea9c6fe69c1eba1d3580da3e82d255e09d6a18c44eac1041b2622559f1e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a0018c1c4a19d9c3aa2746736e13023cf8cfc890f8c72fdd5bcf0adb446c080cb688b8a6b2678033f4b6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0291a28da7cafebeb74d00680bc8cc1523cce7ef48dce4e7555ca5e06fa1fe678a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04c22ec0c6017d93439471236440ae1fbc060069c492c9794654402e1918069d3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152eb8203e880a0fe9fd69d8087edf25007bb90323a76b05df183e8e577b99de9c3ee422ff476498863fa75ddc085fdc2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf902f73ccbd397539a4bd4c9927fa9a137e42906079bed94cd92edac540e1cda",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8e7ea97843c37becdd0e0a66aa1333c401a4dfee3978267595d30ed2e0e6129b",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55057",
+                "balance" : "0x4563918244f552eb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612909",
+                "balance" : "0x0de0b6b3a7612675",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallIdentity_4_gas18_d0g0v0_Homestead" : {
+    "CallIdentity_4_gas18_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x255997249c9a278dccad255bd0e14f663da1d1be79f696b1935c4d1472b7700b",
+                    "mixHash" : "0xecdf33fc6771433471a4880c78569eb0125757d99095bde3ad65606f19356298",
+                    "nonce" : "0xcb1ec330074b0400",
+                    "number" : "0x01",
+                    "parentHash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
+                    "receiptTrie" : "0xe51e587ae000fbe334f34385eeb0306659e8888ea18863d154679c4ad9e074da",
+                    "stateRoot" : "0x315f68ece7f373370bdc9b3f7fd3ff84bae9cf134fc8bc2173354e6b2ecd6086",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0315f68ece7f373370bdc9b3f7fd3ff84bae9cf134fc8bc2173354e6b2ecd6086a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e51e587ae000fbe334f34385eeb0306659e8888ea18863d154679c4ad9e074dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0ecdf33fc6771433471a4880c78569eb0125757d99095bde3ad65606f1935629888cb1ec330074b0400f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x255997249c9a278dccad255bd0e14f663da1d1be79f696b1935c4d1472b7700b",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f143",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761881d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_4_gas18_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/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015057",
-                    "hash" : "0x975072d53c59a7b365d18dae9e1d22e775320fbf21f9a2b843605d60071f98f0",
-                    "mixHash" : "0x1098852400273511327c7118e4995bb8590cfc6f7e54b0a31b3dd91cfa74b429",
-                    "nonce" : "0x062803c7c2ba1c54",
+                    "hash" : "0x98630e0ea4a441331661c9b7685b67496c6e9b703664edee509f69f20a548688",
+                    "mixHash" : "0xfc3cb10722cc9392b9d87739243f8302688761c44dfec6d3c1ebdd456757fa0b",
+                    "nonce" : "0x139fa1380d76fe0b",
                     "number" : "0x01",
                     "parentHash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
                     "receiptTrie" : "0x0e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094b6ea9c6fe69c1eba1d3580da3e82d255e09d6a18c44eac1041b2622559f1e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a01098852400273511327c7118e4995bb8590cfc6f7e54b0a31b3dd91cfa74b42988062803c7c2ba1c54f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094b6ea9c6fe69c1eba1d3580da3e82d255e09d6a18c44eac1041b2622559f1e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a0fc3cb10722cc9392b9d87739243f8302688761c44dfec6d3c1ebdd456757fa0b88139fa1380d76fe0bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x975072d53c59a7b365d18dae9e1d22e775320fbf21f9a2b843605d60071f98f0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x98630e0ea4a441331661c9b7685b67496c6e9b703664edee509f69f20a548688",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallIdentity_4_gas18_d0g0v0_Metropolis" : {
+    "CallIdentity_4_gas18_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/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf143",
-                    "hash" : "0x53b5c8d072f1f12313778cc650e74a9ca8aa6388ee9ff8da501070a2b596e7a5",
-                    "mixHash" : "0xa5d34e3594586ff14f64c6400c103dfe0b37795b50580f83e156adbff4e3a304",
-                    "nonce" : "0x7d2ba682673f768e",
+                    "gasUsed" : "0x015057",
+                    "hash" : "0xf5a9661e9532e652107924b5859cbc82eb5c08f569556f12eefeda69284fd18a",
+                    "mixHash" : "0x4b50c6dbaad1f95fb8d36ea6a63deb7b3e4153e8f73894bdc307eec59dfebde4",
+                    "nonce" : "0x06e3367bc606a41a",
                     "number" : "0x01",
                     "parentHash" : "0x4164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24daf",
-                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
-                    "stateRoot" : "0xa62c574b101048e51bdb739447cab9da74a938e23cc33aee4572b388a5a07ea1",
+                    "receiptTrie" : "0x0e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5",
+                    "stateRoot" : "0x94b6ea9c6fe69c1eba1d3580da3e82d255e09d6a18c44eac1041b2622559f1e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a62c574b101048e51bdb739447cab9da74a938e23cc33aee4572b388a5a07ea1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0a5d34e3594586ff14f64c6400c103dfe0b37795b50580f83e156adbff4e3a304887d2ba682673f768ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a04164bec441c0f0fcd6907b75cfec5b7c79437636321cdaaaf8b301050bc24dafa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094b6ea9c6fe69c1eba1d3580da3e82d255e09d6a18c44eac1041b2622559f1e3a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00e03edc0b7658d40dfeb73be87d97a86573696c7384f0e934962a4bffc0147a5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150578203e880a04b50c6dbaad1f95fb8d36ea6a63deb7b3e4153e8f73894bdc307eec59dfebde48806e3367bc606a41af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e72b378c798a5686761a8fa435568dc0c941cb1925b2a3aae1c32641c7c67a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53b5c8d072f1f12313778cc650e74a9ca8aa6388ee9ff8da501070a2b596e7a5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf5a9661e9532e652107924b5859cbc82eb5c08f569556f12eefeda69284fd18a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f143",
+                "balance" : "0x4563918244f55057",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761881d",
+                "balance" : "0x0de0b6b3a7612909",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_5_d0g0v0.json
index 9f035d0f5..0102baa76 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallIdentity_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallIdentity_5_d0g0v0_EIP150" : {
+    "CallIdentity_5_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/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fa360",
-                    "hash" : "0xe9acffd59d21bb2a4e895789beb84d71c165e25885071c814a78e635a7beb4e1",
-                    "mixHash" : "0x46e93e601453b420fadf27a61959d73f346be72bcbe84e26fa9de41fd520002c",
-                    "nonce" : "0x84692b79f30bc5ca",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0x1dd66c887f4cc837644cc55769d1d9151e92b222059c71fdf57401bfd9fb60e8",
+                    "mixHash" : "0xdd8cfdf31e80acbd6bbc8ae8583b19f1e27cc634c9da17b9fe6295b9a10da94c",
+                    "nonce" : "0xbcd9f845f606a702",
                     "number" : "0x01",
                     "parentHash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
-                    "receiptTrie" : "0xc8720d141e148526f799fedad064033c2a58ab0ffff33f9ee5d73db1069ca590",
-                    "stateRoot" : "0x0fd2422b1d6ea127d603d5f71feb21528e84b93fe3826a94a91fd9311e528320",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0xf78195a6993d71703bc360d8a716e991e0b9a8e262cae630271eab1f3ba5f766",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fd2422b1d6ea127d603d5f71feb21528e84b93fe3826a94a91fd9311e528320a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0c8720d141e148526f799fedad064033c2a58ab0ffff33f9ee5d73db1069ca590b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa3608203e880a046e93e601453b420fadf27a61959d73f346be72bcbe84e26fa9de41fd520002c8884692b79f30bc5caf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f78195a6993d71703bc360d8a716e991e0b9a8e262cae630271eab1f3ba5f766a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0dd8cfdf31e80acbd6bbc8ae8583b19f1e27cc634c9da17b9fe6295b9a10da94c88bcd9f845f606a702f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9acffd59d21bb2a4e895789beb84d71c165e25885071c814a78e635a7beb4e1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1dd66c887f4cc837644cc55769d1d9151e92b222059c71fdf57401bfd9fb60e8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513a360",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742d600",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CallIdentity_5_d0g0v0_EIP158" : {
+    "CallIdentity_5_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/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0x678a2ae44945132bf1ec928ee1528ad0ab120e21ebe22bf967b1c0e217d6aff1",
-                    "mixHash" : "0x3b0cb375ed5aefca54fad2d8421969d9a2f9c8011632f7d26d55a24a3c0e67d2",
-                    "nonce" : "0xfdea3d333f7106a8",
+                    "hash" : "0xb933a3af6c21004976859bac42010a5dfb5c68071a4e80c7853ad1b49ba6f657",
+                    "mixHash" : "0x747ebdd804921f54ea493013cbeb1d8d868159bc25cd0f9896fb548123d9933a",
+                    "nonce" : "0x73f8d9a9b4e27c2b",
                     "number" : "0x01",
                     "parentHash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
-                    "receiptTrie" : "0x674b47aa205cefac18144eacb4d6906fb9877e7ca154f182e8786e7ba42abafe",
-                    "stateRoot" : "0x7ffd108d5d905c7b404b26cb24c9233cf4211e08fa93e7890c71fcfb168cc267",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0xf78195a6993d71703bc360d8a716e991e0b9a8e262cae630271eab1f3ba5f766",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd108d5d905c7b404b26cb24c9233cf4211e08fa93e7890c71fcfb168cc267a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0674b47aa205cefac18144eacb4d6906fb9877e7ca154f182e8786e7ba42abafeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a03b0cb375ed5aefca54fad2d8421969d9a2f9c8011632f7d26d55a24a3c0e67d288fdea3d333f7106a8f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f78195a6993d71703bc360d8a716e991e0b9a8e262cae630271eab1f3ba5f766a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0747ebdd804921f54ea493013cbeb1d8d868159bc25cd0f9896fb548123d9933a8873f8d9a9b4e27c2bf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x678a2ae44945132bf1ec928ee1528ad0ab120e21ebe22bf967b1c0e217d6aff1",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb933a3af6c21004976859bac42010a5dfb5c68071a4e80c7853ad1b49ba6f657",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CallIdentity_5_d0g0v0_Frontier" : {
+    "CallIdentity_5_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/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fa0cc",
-                    "hash" : "0x3878e1320943a2bcf518e06ca53324e502d8ea8bbac9bf84c1f537553e475677",
-                    "mixHash" : "0x77585870fbf3cceda5a4c30e015acebe325a03749de15965adf6662a94634e17",
-                    "nonce" : "0xb8eb3052b3cba533",
+                    "gasUsed" : "0x1fa360",
+                    "hash" : "0x15c700a7733a6740a8bf1fb6ec2a628aa10c58d04e6485f103e635d310aac59e",
+                    "mixHash" : "0xc37c217cc8c32b547e25842631849d204a329aa46983453c650b2f068072b4a9",
+                    "nonce" : "0xdf0711f66af71028",
                     "number" : "0x01",
                     "parentHash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
-                    "receiptTrie" : "0x9d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642",
-                    "stateRoot" : "0x7a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0",
+                    "receiptTrie" : "0xc8720d141e148526f799fedad064033c2a58ab0ffff33f9ee5d73db1069ca590",
+                    "stateRoot" : "0x0fd2422b1d6ea127d603d5f71feb21528e84b93fe3826a94a91fd9311e528320",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a09d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a077585870fbf3cceda5a4c30e015acebe325a03749de15965adf6662a94634e1788b8eb3052b3cba533f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fd2422b1d6ea127d603d5f71feb21528e84b93fe3826a94a91fd9311e528320a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0c8720d141e148526f799fedad064033c2a58ab0ffff33f9ee5d73db1069ca590b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa3608203e880a0c37c217cc8c32b547e25842631849d204a329aa46983453c650b2f068072b4a988df0711f66af71028f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3878e1320943a2bcf518e06ca53324e502d8ea8bbac9bf84c1f537553e475677",
-        "network" : "Frontier",
+        "lastblockhash" : "0x15c700a7733a6740a8bf1fb6ec2a628aa10c58d04e6485f103e635d310aac59e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513a0cc",
+                "balance" : "0x456391824513a360",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742d894",
+                "balance" : "0x0de0b6b3a742d600",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CallIdentity_5_d0g0v0_Homestead" : {
+    "CallIdentity_5_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/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fa0cc",
-                    "hash" : "0x83d3821035bf5223fa2f74335ed03853583d5f98655a616091c8aa617e575b19",
-                    "mixHash" : "0xcf8f0dd56af8c7d156bee1718a0d90cf6973435b5f7d7f4df83961b390596d93",
-                    "nonce" : "0xb361f6886be63e6e",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0xc27a2f2244124994f5d1f7ccb5c5f0624b0dc9dc8ebe6767b5be3a46f9888899",
+                    "mixHash" : "0xdcf6355f54e32cdf57324f29b16540a32e6a7a8396b893037fc719a85fe46cbf",
+                    "nonce" : "0x24f40b35afcb4ae0",
                     "number" : "0x01",
                     "parentHash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
-                    "receiptTrie" : "0x9d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642",
-                    "stateRoot" : "0x7a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0",
+                    "receiptTrie" : "0x674b47aa205cefac18144eacb4d6906fb9877e7ca154f182e8786e7ba42abafe",
+                    "stateRoot" : "0x7ffd108d5d905c7b404b26cb24c9233cf4211e08fa93e7890c71fcfb168cc267",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a09d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a0cf8f0dd56af8c7d156bee1718a0d90cf6973435b5f7d7f4df83961b390596d9388b361f6886be63e6ef865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ffd108d5d905c7b404b26cb24c9233cf4211e08fa93e7890c71fcfb168cc267a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0674b47aa205cefac18144eacb4d6906fb9877e7ca154f182e8786e7ba42abafeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0dcf6355f54e32cdf57324f29b16540a32e6a7a8396b893037fc719a85fe46cbf8824f40b35afcb4ae0f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83d3821035bf5223fa2f74335ed03853583d5f98655a616091c8aa617e575b19",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc27a2f2244124994f5d1f7ccb5c5f0624b0dc9dc8ebe6767b5be3a46f9888899",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513a0cc",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742d894",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CallIdentity_5_d0g0v0_Metropolis" : {
+    "CallIdentity_5_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/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f41b8",
-                    "hash" : "0xbbff46eab3309e4c53e35ac28b78cf077fcf4914967e55fae1943759c18af6f6",
-                    "mixHash" : "0xd2069b0859f967fb3925bcf40a39d473c867ea69374381f5e41032a78b773b8f",
-                    "nonce" : "0x66e1ff9dc3e079d0",
+                    "gasUsed" : "0x1fa0cc",
+                    "hash" : "0x69c77d0af611da6370e04e7a45db8b32261b94121ff5ab3bfe5420c215259e95",
+                    "mixHash" : "0xfcbac6b33a891ea3237fba434528e216523b75a6c90e6746ad38d55db5a098ce",
+                    "nonce" : "0x06e4a28648d7c6cd",
                     "number" : "0x01",
                     "parentHash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
-                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
-                    "stateRoot" : "0xf78195a6993d71703bc360d8a716e991e0b9a8e262cae630271eab1f3ba5f766",
+                    "receiptTrie" : "0x9d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642",
+                    "stateRoot" : "0x7a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f78195a6993d71703bc360d8a716e991e0b9a8e262cae630271eab1f3ba5f766a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0d2069b0859f967fb3925bcf40a39d473c867ea69374381f5e41032a78b773b8f8866e1ff9dc3e079d0f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a09d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a0fcbac6b33a891ea3237fba434528e216523b75a6c90e6746ad38d55db5a098ce8806e4a28648d7c6cdf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbbff46eab3309e4c53e35ac28b78cf077fcf4914967e55fae1943759c18af6f6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x69c77d0af611da6370e04e7a45db8b32261b94121ff5ab3bfe5420c215259e95",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824513a0cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a742d894",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallIdentity_5_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1fa0cc",
+                    "hash" : "0x07ed591f3f4e22f9379aa7b18ae8070778f37fbfa15084339f4ee75fd299b6f0",
+                    "mixHash" : "0x06173e3a48f212283ec913333d63da1bcb349cfa236a023cd36601f0cee3d0a1",
+                    "nonce" : "0x8d8b4029ffbf5001",
+                    "number" : "0x01",
+                    "parentHash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
+                    "receiptTrie" : "0x9d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642",
+                    "stateRoot" : "0x7a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a65c7316833431e9bd3f21207dbd4cdfa478ca6253eccf74718ebce6fea5cb0a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a09d56947f4b282c62f1f1ac7610d16fcc0ffb6c206b7565deef8600dc3c3c0642b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a006173e3a48f212283ec913333d63da1bcb349cfa236a023cd36601f0cee3d0a1888d8b4029ffbf5001f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x614c13b760797fa294a98c8567a95febf77150ba326aa67b2b32c40b9804a8c6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0388f0a660d482dea0f80b9d3d31e77e357aeea01ee165632495e5b224f7dd137a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x07ed591f3f4e22f9379aa7b18ae8070778f37fbfa15084339f4ee75fd299b6f0",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451341b8",
+                "balance" : "0x456391824513a0cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a74337a8",
+                "balance" : "0x0de0b6b3a742d894",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0_d0g0v0.json
index 801d89c51..c964c438f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_0_d0g0v0_EIP150" : {
+    "CallRipemd160_0_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/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0105b5",
-                    "hash" : "0x0ad4eccd89a01aa409d54c50777241a180da27bbd806c43f01f085662fea5816",
-                    "mixHash" : "0x8a6028cbff6a6c7d7b4a89f3d017f2366a51796194f436893b1d75532ae0dc2f",
-                    "nonce" : "0x35a91ac39880b1f1",
+                    "gasUsed" : "0xa40d",
+                    "hash" : "0xd402c88b2dd393e8d1f7cacf21e6b71467b97e63e3a60d5db6eee42fccaefd82",
+                    "mixHash" : "0x8ff354126c94fff6d58abf390b8eb55c726c679d6bd64e54880bef05bf4c0dfc",
+                    "nonce" : "0x3e0721606deab36a",
                     "number" : "0x01",
                     "parentHash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
-                    "receiptTrie" : "0xc01057f7494e5187e2c88275c3777697e9bfb8b80b20551dd4431e6479dd5bfb",
-                    "stateRoot" : "0x733eea90b3b0b1ea756a853a10f5ec5b2430a0bb2d3b96a13015f644da02ce3f",
+                    "receiptTrie" : "0x4fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286a",
+                    "stateRoot" : "0x255c6ae10939ae9ba7d237154a50c1712c59f490f6c99b32dc2d1a616883fe9a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0733eea90b3b0b1ea756a853a10f5ec5b2430a0bb2d3b96a13015f644da02ce3fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c01057f7494e5187e2c88275c3777697e9bfb8b80b20551dd4431e6479dd5bfbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830105b58203e880a08a6028cbff6a6c7d7b4a89f3d017f2366a51796194f436893b1d75532ae0dc2f8835a91ac39880b1f1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0255c6ae10939ae9ba7d237154a50c1712c59f490f6c99b32dc2d1a616883fe9aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a08ff354126c94fff6d58abf390b8eb55c726c679d6bd64e54880bef05bf4c0dfc883e0721606deab36af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ad4eccd89a01aa409d54c50777241a180da27bbd806c43f01f085662fea5816",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd402c88b2dd393e8d1f7cacf21e6b71467b97e63e3a60d5db6eee42fccaefd82",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600360fff1600051600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f505b5",
+                "balance" : "0x4563918244f4a40d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76173ab",
+                "balance" : "0x0de0b6b3a761d553",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CallRipemd160_0_d0g0v0_EIP158" : {
+    "CallRipemd160_0_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/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa40d",
-                    "hash" : "0x75b40e13357b990171c611194e4992e3b5b94bd7005f7458a8305a403246deab",
-                    "mixHash" : "0xd568697ac5b6bffa870f36f81d0a64db0ff38f71f40a704e3b8f64d2d35bc5cd",
-                    "nonce" : "0xb8a17269a8fda7ba",
+                    "hash" : "0xcd680e4ab1e5c3c30c92b6456ba0388e4d926be30166f03f6e8a74590f1ce912",
+                    "mixHash" : "0x7c470d39fa3b72cb1447cad4602ef0e0e35ee2afd448c2a7a160dbd3bbdf0d09",
+                    "nonce" : "0xf111c06427b090dc",
                     "number" : "0x01",
                     "parentHash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
-                    "receiptTrie" : "0x85799f1fe7953c2694d55888d110a42a0c967daa57c7b910f1992b76567871bf",
-                    "stateRoot" : "0xdd5493814cb92399e51909d9195afe38c2eebd6d0a607ded5903eeaf6db9fa04",
+                    "receiptTrie" : "0x4fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286a",
+                    "stateRoot" : "0x255c6ae10939ae9ba7d237154a50c1712c59f490f6c99b32dc2d1a616883fe9a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd5493814cb92399e51909d9195afe38c2eebd6d0a607ded5903eeaf6db9fa04a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba085799f1fe7953c2694d55888d110a42a0c967daa57c7b910f1992b76567871bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a0d568697ac5b6bffa870f36f81d0a64db0ff38f71f40a704e3b8f64d2d35bc5cd88b8a17269a8fda7baf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0255c6ae10939ae9ba7d237154a50c1712c59f490f6c99b32dc2d1a616883fe9aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a07c470d39fa3b72cb1447cad4602ef0e0e35ee2afd448c2a7a160dbd3bbdf0d0988f111c06427b090dcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75b40e13357b990171c611194e4992e3b5b94bd7005f7458a8305a403246deab",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcd680e4ab1e5c3c30c92b6456ba0388e4d926be30166f03f6e8a74590f1ce912",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600360fff1600051600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CallRipemd160_0_d0g0v0_Frontier" : {
+    "CallRipemd160_0_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/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010321",
-                    "hash" : "0x5192896ebf0afc03d67dba45234ca1baf36768eaec5ef78b31a09c145b682869",
-                    "mixHash" : "0x4b612b2d58cc303024f74e481b703f37dc459192061afa0a5aeaf07d5dd53e5b",
-                    "nonce" : "0x68c2a841117a1bfe",
+                    "gasUsed" : "0x0105b5",
+                    "hash" : "0x5d6d8de235e9656b81ec26c575c1de6877b11bd4f72d5a3e59973169f33e86e8",
+                    "mixHash" : "0x766b03e6b15555955d0a7d7ce92d980967f5db0c9d75907dd623fe0c4b52b6ea",
+                    "nonce" : "0x0e79e9e5da627c8c",
                     "number" : "0x01",
                     "parentHash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
-                    "receiptTrie" : "0xe98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68",
-                    "stateRoot" : "0x3337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25",
+                    "receiptTrie" : "0xc01057f7494e5187e2c88275c3777697e9bfb8b80b20551dd4431e6479dd5bfb",
+                    "stateRoot" : "0x733eea90b3b0b1ea756a853a10f5ec5b2430a0bb2d3b96a13015f644da02ce3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103218203e880a04b612b2d58cc303024f74e481b703f37dc459192061afa0a5aeaf07d5dd53e5b8868c2a841117a1bfef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0733eea90b3b0b1ea756a853a10f5ec5b2430a0bb2d3b96a13015f644da02ce3fa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c01057f7494e5187e2c88275c3777697e9bfb8b80b20551dd4431e6479dd5bfbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830105b58203e880a0766b03e6b15555955d0a7d7ce92d980967f5db0c9d75907dd623fe0c4b52b6ea880e79e9e5da627c8cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5192896ebf0afc03d67dba45234ca1baf36768eaec5ef78b31a09c145b682869",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5d6d8de235e9656b81ec26c575c1de6877b11bd4f72d5a3e59973169f33e86e8",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50321",
+                "balance" : "0x4563918244f505b5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761763f",
+                "balance" : "0x0de0b6b3a76173ab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CallRipemd160_0_d0g0v0_Homestead" : {
+    "CallRipemd160_0_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/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010321",
-                    "hash" : "0x247fb7c854306544b6edf83674a36364fd18c6661b720dd41c60afb7c73852cd",
-                    "mixHash" : "0xfd5e6120b4afc32e128d2c05f9703775e35a855eea302e305b673e5adc3c9182",
-                    "nonce" : "0xba544f0e7ba1f540",
+                    "gasUsed" : "0xa40d",
+                    "hash" : "0x808a5081a5797505f1ad9cbedd682238a85924eb2d217bb58328427c1d206999",
+                    "mixHash" : "0x076bd95a67303f875d18f4afb3e342d2483f67b42431cebf742a1e10fad54ad2",
+                    "nonce" : "0x869fcc069eb1b608",
                     "number" : "0x01",
                     "parentHash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
-                    "receiptTrie" : "0xe98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68",
-                    "stateRoot" : "0x3337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25",
+                    "receiptTrie" : "0x85799f1fe7953c2694d55888d110a42a0c967daa57c7b910f1992b76567871bf",
+                    "stateRoot" : "0xdd5493814cb92399e51909d9195afe38c2eebd6d0a607ded5903eeaf6db9fa04",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103218203e880a0fd5e6120b4afc32e128d2c05f9703775e35a855eea302e305b673e5adc3c918288ba544f0e7ba1f540f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd5493814cb92399e51909d9195afe38c2eebd6d0a607ded5903eeaf6db9fa04a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba085799f1fe7953c2694d55888d110a42a0c967daa57c7b910f1992b76567871bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a0076bd95a67303f875d18f4afb3e342d2483f67b42431cebf742a1e10fad54ad288869fcc069eb1b608f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x247fb7c854306544b6edf83674a36364fd18c6661b720dd41c60afb7c73852cd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x808a5081a5797505f1ad9cbedd682238a85924eb2d217bb58328427c1d206999",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50321",
+                "balance" : "0x4563918244f4a40d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761763f",
+                "balance" : "0x0de0b6b3a761d553",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CallRipemd160_0_d0g0v0_Metropolis" : {
+    "CallRipemd160_0_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/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa40d",
-                    "hash" : "0xf8cc8c297dca4a90809eca382c21b5c9b27518dd25df2dbd616b10dcffff34e4",
-                    "mixHash" : "0x913d01f14be970b0e8d535a78c201686ba9ce927d138e1fd0aed0834745812a2",
-                    "nonce" : "0xf2041cea66de49c7",
+                    "gasUsed" : "0x010321",
+                    "hash" : "0x2dfd855f5ab188f3f60122962f75be68bcaa9ba3b2d8356e8d400d5ca6431f5d",
+                    "mixHash" : "0xc2ad6faa304924d637631e26751c495f216c5e5162fa8032c1da32e9ec0ec851",
+                    "nonce" : "0xe9259fa08010ced8",
                     "number" : "0x01",
                     "parentHash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
-                    "receiptTrie" : "0x4fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286a",
-                    "stateRoot" : "0x255c6ae10939ae9ba7d237154a50c1712c59f490f6c99b32dc2d1a616883fe9a",
+                    "receiptTrie" : "0xe98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68",
+                    "stateRoot" : "0x3337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0255c6ae10939ae9ba7d237154a50c1712c59f490f6c99b32dc2d1a616883fe9aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fcd8304b80add341e46b29a2cf3603ea42f3fef656606f7cf3aa937ac5f286ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a40d8203e880a0913d01f14be970b0e8d535a78c201686ba9ce927d138e1fd0aed0834745812a288f2041cea66de49c7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103218203e880a0c2ad6faa304924d637631e26751c495f216c5e5162fa8032c1da32e9ec0ec85188e9259fa08010ced8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8cc8c297dca4a90809eca382c21b5c9b27518dd25df2dbd616b10dcffff34e4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2dfd855f5ab188f3f60122962f75be68bcaa9ba3b2d8356e8d400d5ca6431f5d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x600160005260206000602060006000600360fff1600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50321",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761763f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x600160005260206000602060006000600360fff1600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_0_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x010321",
+                    "hash" : "0x13dea4bd82d6c0d9246dff83d2f2cbc4d7f0622ccf28ea47126e28dca8df44d8",
+                    "mixHash" : "0x09a701c623f962ef15fd19544b7eb2ba89f1d6c1cf45c6b487ff163d41226e52",
+                    "nonce" : "0xf18f65a611255836",
+                    "number" : "0x01",
+                    "parentHash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
+                    "receiptTrie" : "0xe98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68",
+                    "stateRoot" : "0x3337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0b4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03337fa5558afcd789c16dcc96df96018a14af8b5ea7ab46044a796e928fc5e25a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e98d6c6e3e38247c8689c5f76ba881ef6153dada79f5173df25865e4f3f31a68b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103218203e880a009a701c623f962ef15fd19544b7eb2ba89f1d6c1cf45c6b487ff163d41226e5288f18f65a611255836f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb4a1ae2d743bd38f7f7df122fc53cd5c3b794d2c6bf77399525f4621224679bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025fb50258987dd4e4cdce638670206fc9ec925afb39f603bdf47270c0c6c9200a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x13dea4bd82d6c0d9246dff83d2f2cbc4d7f0622ccf28ea47126e28dca8df44d8",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600360fff1600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a40d",
+                "balance" : "0x4563918244f50321",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d553",
+                "balance" : "0x0de0b6b3a761763f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1_d0g0v0.json
index 299f90d42..4a448fed4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_1_d0g0v0_EIP150" : {
+    "CallRipemd160_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015528",
-                    "hash" : "0x1c700e0a2ecb3e56757d5b4268df9d0336a36bf9df247fff110d7af312b81a8e",
-                    "mixHash" : "0xec33c2b1a703936679abcb8595ef164eaa712d5ae71c52721785785aafd303ea",
-                    "nonce" : "0x1634055e6a8022bd",
+                    "gasUsed" : "0xf380",
+                    "hash" : "0x8aff4aa37f3963ab22182e04998fa1cb44f3d35f73496fc28f33ee90caacb5b4",
+                    "mixHash" : "0xe6abbbfab9cb454399aeadfea6e7ffc96592daa3b914dd5b6c6ef6a76a6d5014",
+                    "nonce" : "0xa2dd8213824c7e91",
                     "number" : "0x01",
                     "parentHash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
-                    "receiptTrie" : "0xcb0074a717930935462dd6968dffcaac6bfdbed52fb8bc0ff69bcf357a7688bb",
-                    "stateRoot" : "0x71438ea20ecd80d475c7879019f84fad40219398f8f9b5298d0efa3b189569d1",
+                    "receiptTrie" : "0x64c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6e",
+                    "stateRoot" : "0x19c358a41526fc4aefb33a7a36ee8fbf8bca030803564ce6d0ebee46a0f0fd01",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071438ea20ecd80d475c7879019f84fad40219398f8f9b5298d0efa3b189569d1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cb0074a717930935462dd6968dffcaac6bfdbed52fb8bc0ff69bcf357a7688bbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155288203e880a0ec33c2b1a703936679abcb8595ef164eaa712d5ae71c52721785785aafd303ea881634055e6a8022bdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019c358a41526fc4aefb33a7a36ee8fbf8bca030803564ce6d0ebee46a0f0fd01a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0e6abbbfab9cb454399aeadfea6e7ffc96592daa3b914dd5b6c6ef6a76a6d501488a2dd8213824c7e91f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c700e0a2ecb3e56757d5b4268df9d0336a36bf9df247fff110d7af312b81a8e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8aff4aa37f3963ab22182e04998fa1cb44f3d35f73496fc28f33ee90caacb5b4",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55528",
+                "balance" : "0x4563918244f4f380",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612438",
+                "balance" : "0x0de0b6b3a76185e0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallRipemd160_1_d0g0v0_EIP158" : {
+    "CallRipemd160_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf380",
-                    "hash" : "0xbd0b7a4c0cbda4e273feb0368fef3df9faa8ee1a9de259b295fe36825bc548d6",
-                    "mixHash" : "0x1efc9d2a422dfccf07bdec08807b2129c13bc61a4b1f9d0a32b913b28f4495db",
-                    "nonce" : "0xf030160ba56842b5",
+                    "hash" : "0xfd2df83d94fbe9f36c3b1b93369f77c203a02a5edaa773155561547f5da4bf65",
+                    "mixHash" : "0xc130e5d9c0a5bb5f6489ae241255d3fdcee0b44f08dd1d4bec24998d764fee50",
+                    "nonce" : "0xa537446d4a2f4349",
                     "number" : "0x01",
                     "parentHash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
-                    "receiptTrie" : "0x15cedb713a76049656f54631857acaff457af9daec3d6a2980a6c6d730e1b04a",
-                    "stateRoot" : "0xdbf0dafba0e7ae350bbe4fa0d61329920c272aabc2e4330127402b3b9e707eb6",
+                    "receiptTrie" : "0x64c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6e",
+                    "stateRoot" : "0x19c358a41526fc4aefb33a7a36ee8fbf8bca030803564ce6d0ebee46a0f0fd01",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbf0dafba0e7ae350bbe4fa0d61329920c272aabc2e4330127402b3b9e707eb6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba015cedb713a76049656f54631857acaff457af9daec3d6a2980a6c6d730e1b04ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a01efc9d2a422dfccf07bdec08807b2129c13bc61a4b1f9d0a32b913b28f4495db88f030160ba56842b5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019c358a41526fc4aefb33a7a36ee8fbf8bca030803564ce6d0ebee46a0f0fd01a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0c130e5d9c0a5bb5f6489ae241255d3fdcee0b44f08dd1d4bec24998d764fee5088a537446d4a2f4349f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd0b7a4c0cbda4e273feb0368fef3df9faa8ee1a9de259b295fe36825bc548d6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfd2df83d94fbe9f36c3b1b93369f77c203a02a5edaa773155561547f5da4bf65",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x602060006000600060006003610258f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallRipemd160_1_d0g0v0_Frontier" : {
+    "CallRipemd160_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015294",
-                    "hash" : "0x8738e88b480e4dde7b6501419b98cf6275b30b05c7b746c34cb0d7254c93c218",
-                    "mixHash" : "0x0bfa0ee8dacc5fc3181c6eefff2223bd65106f3acb118d8482bc9f0e72fa384d",
-                    "nonce" : "0xcea1065e77d17aad",
+                    "gasUsed" : "0x015528",
+                    "hash" : "0xa45484f82e189682f87b6ff5db92e7a7becfe1c7fabb27e62243bff3a64484cf",
+                    "mixHash" : "0x575ad9def6ffcf9fe9063ab08d51e966d6c038f46aa834b6b6676f5307b4922d",
+                    "nonce" : "0x59c7d363f70a44c5",
                     "number" : "0x01",
                     "parentHash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
-                    "receiptTrie" : "0x533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524",
-                    "stateRoot" : "0xc23fa0c523b4505c3d8457931f1abf0cbd1ed51bfc9180347486e5cf1f280f3a",
+                    "receiptTrie" : "0xcb0074a717930935462dd6968dffcaac6bfdbed52fb8bc0ff69bcf357a7688bb",
+                    "stateRoot" : "0x71438ea20ecd80d475c7879019f84fad40219398f8f9b5298d0efa3b189569d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23fa0c523b4505c3d8457931f1abf0cbd1ed51bfc9180347486e5cf1f280f3aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152948203e880a00bfa0ee8dacc5fc3181c6eefff2223bd65106f3acb118d8482bc9f0e72fa384d88cea1065e77d17aadf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071438ea20ecd80d475c7879019f84fad40219398f8f9b5298d0efa3b189569d1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0cb0074a717930935462dd6968dffcaac6bfdbed52fb8bc0ff69bcf357a7688bbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155288203e880a0575ad9def6ffcf9fe9063ab08d51e966d6c038f46aa834b6b6676f5307b4922d8859c7d363f70a44c5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8738e88b480e4dde7b6501419b98cf6275b30b05c7b746c34cb0d7254c93c218",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa45484f82e189682f87b6ff5db92e7a7becfe1c7fabb27e62243bff3a64484cf",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55294",
+                "balance" : "0x4563918244f55528",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76126cc",
+                "balance" : "0x0de0b6b3a7612438",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallRipemd160_1_d0g0v0_Homestead" : {
+    "CallRipemd160_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf380",
+                    "hash" : "0xc14a0d920140a63e869241f4af57c271f38cb6366d1ed35ab5fa6a24bf9a1a8f",
+                    "mixHash" : "0x91d2f49f434a67c9425c8f74ec577d2d7d3dde399d5add0142c9490535144b8a",
+                    "nonce" : "0x9d3eec05036c603b",
+                    "number" : "0x01",
+                    "parentHash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
+                    "receiptTrie" : "0x15cedb713a76049656f54631857acaff457af9daec3d6a2980a6c6d730e1b04a",
+                    "stateRoot" : "0xdbf0dafba0e7ae350bbe4fa0d61329920c272aabc2e4330127402b3b9e707eb6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbf0dafba0e7ae350bbe4fa0d61329920c272aabc2e4330127402b3b9e707eb6a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba015cedb713a76049656f54631857acaff457af9daec3d6a2980a6c6d730e1b04ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a091d2f49f434a67c9425c8f74ec577d2d7d3dde399d5add0142c9490535144b8a889d3eec05036c603bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc14a0d920140a63e869241f4af57c271f38cb6366d1ed35ab5fa6a24bf9a1a8f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x602060006000600060006003610258f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f380",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76185e0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x602060006000600060006003610258f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015294",
-                    "hash" : "0x0b757b5ed4af138aa9bf2375ba4f03ff91c4fd9a8ec6b301a61fca6ce9b33822",
-                    "mixHash" : "0xbb1fa51860d6e14054a89fc78d01e5ed905120b1a1f5057441e5ccb3dcf3f1a0",
-                    "nonce" : "0x9c8ca6f7d747b7fd",
+                    "hash" : "0xc28c783f220f150ce5a230a1301046f698f8d6d8a197c6ce3969b498256cd0ce",
+                    "mixHash" : "0xa6aa4759f8e7f08edf86e310abdbb99676b2b09b3b8df8cd86e835737486963b",
+                    "nonce" : "0x62fc5903adfb5763",
                     "number" : "0x01",
                     "parentHash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
                     "receiptTrie" : "0x533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23fa0c523b4505c3d8457931f1abf0cbd1ed51bfc9180347486e5cf1f280f3aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152948203e880a0bb1fa51860d6e14054a89fc78d01e5ed905120b1a1f5057441e5ccb3dcf3f1a0889c8ca6f7d747b7fdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23fa0c523b4505c3d8457931f1abf0cbd1ed51bfc9180347486e5cf1f280f3aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152948203e880a0a6aa4759f8e7f08edf86e310abdbb99676b2b09b3b8df8cd86e835737486963b8862fc5903adfb5763f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b757b5ed4af138aa9bf2375ba4f03ff91c4fd9a8ec6b301a61fca6ce9b33822",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc28c783f220f150ce5a230a1301046f698f8d6d8a197c6ce3969b498256cd0ce",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallRipemd160_1_d0g0v0_Metropolis" : {
+    "CallRipemd160_1_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/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf380",
-                    "hash" : "0x8f7cbf64eebb295b41adead6a92262f6890f52b55772ab3ea0f85a91dfc58c95",
-                    "mixHash" : "0x572bcc7345409b8292c4ef5bc13c3bc9acf424cec8e87450a7394050b8d9c61c",
-                    "nonce" : "0xefe753cfaffe430e",
+                    "gasUsed" : "0x015294",
+                    "hash" : "0x618d371167828b433cf4511654d5b1558e0e98cd4fd71b0075b7f73ed49475e1",
+                    "mixHash" : "0x61e59b17b903a7b77e431de3d8931c2d3f02a8ec2f39fef8e6554a3d512def07",
+                    "nonce" : "0x4f6b3bfefd1ddf15",
                     "number" : "0x01",
                     "parentHash" : "0xc7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4",
-                    "receiptTrie" : "0x64c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6e",
-                    "stateRoot" : "0x19c358a41526fc4aefb33a7a36ee8fbf8bca030803564ce6d0ebee46a0f0fd01",
+                    "receiptTrie" : "0x533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524",
+                    "stateRoot" : "0xc23fa0c523b4505c3d8457931f1abf0cbd1ed51bfc9180347486e5cf1f280f3a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019c358a41526fc4aefb33a7a36ee8fbf8bca030803564ce6d0ebee46a0f0fd01a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064c9672b2e1a8f6a90dad9d8fc484ca2ba130e0d5316ce5213ccff7d2b728c6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f3808203e880a0572bcc7345409b8292c4ef5bc13c3bc9acf424cec8e87450a7394050b8d9c61c88efe753cfaffe430ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0c7f4490c5ec54fa75284b6318b1b083a59a35340a072d8bccd47308f89cb64e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23fa0c523b4505c3d8457931f1abf0cbd1ed51bfc9180347486e5cf1f280f3aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0533443ca497cba31d33b43548f7c97f74451fe1ff15683e773dbb67922376524b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830152948203e880a061e59b17b903a7b77e431de3d8931c2d3f02a8ec2f39fef8e6554a3d512def07884f6b3bfefd1ddf15f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f20d02f30d0be4a64a35e99d42573c2c4c103021263d5b65cbea2b87ee71a7dca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f7cbf64eebb295b41adead6a92262f6890f52b55772ab3ea0f85a91dfc58c95",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x618d371167828b433cf4511654d5b1558e0e98cd4fd71b0075b7f73ed49475e1",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f380",
+                "balance" : "0x4563918244f55294",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76185e0",
+                "balance" : "0x0de0b6b3a76126cc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2_d0g0v0.json
index 435cbb54a..bdd904217 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_2_d0g0v0_EIP150" : {
+    "CallRipemd160_2_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/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015624",
-                    "hash" : "0xe9c803dbcfdf97f7111e57712b143d70fe9c2e0367707e0207ef95947042ee6b",
-                    "mixHash" : "0x2d0f8fdd930559a6274f68ba7efd082efb6be6cb8d4478d3c065c40ee7b0bb99",
-                    "nonce" : "0xe261cfb8d5ef8b58",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x8e842ac0e6a4c3864556daef4ab8d875a6d489149829d53bbc61b9d3f9308cee",
+                    "mixHash" : "0xb2027e385f037d83c6af772e24047338dc39d6cc3dd79a0a7bccbde2cbcfb222",
+                    "nonce" : "0xf78470458426f5db",
                     "number" : "0x01",
                     "parentHash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
-                    "receiptTrie" : "0xa0f9e5e60d730930be766bb819b75ae3714acaf34346261a1de6f1cfb89df26f",
-                    "stateRoot" : "0x94fb407a4280fee3609b54f73e3159705d2f9a5d109be766c11ef94c763e3e81",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0xd1c879164d0bff2e81e2ae8fd610dd6ac3330d14516216f518f0737caf623a82",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094fb407a4280fee3609b54f73e3159705d2f9a5d109be766c11ef94c763e3e81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a0f9e5e60d730930be766bb819b75ae3714acaf34346261a1de6f1cfb89df26fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a02d0f8fdd930559a6274f68ba7efd082efb6be6cb8d4478d3c065c40ee7b0bb9988e261cfb8d5ef8b58f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1c879164d0bff2e81e2ae8fd610dd6ac3330d14516216f518f0737caf623a82a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0b2027e385f037d83c6af772e24047338dc39d6cc3dd79a0a7bccbde2cbcfb22288f78470458426f5dbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9c803dbcfdf97f7111e57712b143d70fe9c2e0367707e0207ef95947042ee6b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8e842ac0e6a4c3864556daef4ab8d875a6d489149829d53bbc61b9d3f9308cee",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55624",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761233c",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallRipemd160_2_d0g0v0_EIP158" : {
+    "CallRipemd160_2_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/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0x5d09523329c11be2ebb45a4bc005f47f3b219520a5070035ed829bd343f5ebb2",
-                    "mixHash" : "0xbca6ad4a3bd2736a5cd8e3f5db9c86cf7602050d29125211b7af6dfca85744c2",
-                    "nonce" : "0x041adb43ae8ad980",
+                    "hash" : "0x9117a038ecf7000dabfa342cf84f140002084ff35fca64c7c20dd06b3e9ae9cd",
+                    "mixHash" : "0xd15ba7bad53c2dc3c9e7f271c9e814d960f0b053c8d84c114d242514516708f4",
+                    "nonce" : "0x0f97b4ed03082aa8",
                     "number" : "0x01",
                     "parentHash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
-                    "receiptTrie" : "0x458701d847e091d39c8841ce846d4112b76d6ce28ff4cac51912b0ad3a162511",
-                    "stateRoot" : "0xfd3d2f63b7c09cd3386b6e74f42f99963b7d45dd575e6f05288a64faaa8d75a4",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0xd1c879164d0bff2e81e2ae8fd610dd6ac3330d14516216f518f0737caf623a82",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd3d2f63b7c09cd3386b6e74f42f99963b7d45dd575e6f05288a64faaa8d75a4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0458701d847e091d39c8841ce846d4112b76d6ce28ff4cac51912b0ad3a162511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0bca6ad4a3bd2736a5cd8e3f5db9c86cf7602050d29125211b7af6dfca85744c288041adb43ae8ad980f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1c879164d0bff2e81e2ae8fd610dd6ac3330d14516216f518f0737caf623a82a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0d15ba7bad53c2dc3c9e7f271c9e814d960f0b053c8d84c114d242514516708f4880f97b4ed03082aa8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d09523329c11be2ebb45a4bc005f47f3b219520a5070035ed829bd343f5ebb2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9117a038ecf7000dabfa342cf84f140002084ff35fca64c7c20dd06b3e9ae9cd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600552602060006025600060006003611770f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallRipemd160_2_d0g0v0_Frontier" : {
+    "CallRipemd160_2_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/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015390",
-                    "hash" : "0x23e1909199d77c500507be532ca9895599aa164984bd19fa7600719e6dfadf74",
-                    "mixHash" : "0x81222ae79c598e0e3804c38bc665f78bd57b3ab3b84f9f5395e5230b8804817c",
-                    "nonce" : "0xd4cb30d43703fcd6",
+                    "gasUsed" : "0x015624",
+                    "hash" : "0x8d9f9b61c0b6fb1ead68baecb1128b83b66d6d111ad5239da1515143e37f9768",
+                    "mixHash" : "0x3e74c08efb6ff713f9625fa8c11ed1289bbdea8a03ffc30f094fc02db6c8ee3d",
+                    "nonce" : "0xc2cc67df0ffe845f",
                     "number" : "0x01",
                     "parentHash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
-                    "receiptTrie" : "0x5c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894ed",
-                    "stateRoot" : "0x09daa51d5789a8ad9b67aa9c793de83b8db00d630f4b9196eebfc48daaf69bb5",
+                    "receiptTrie" : "0xa0f9e5e60d730930be766bb819b75ae3714acaf34346261a1de6f1cfb89df26f",
+                    "stateRoot" : "0x94fb407a4280fee3609b54f73e3159705d2f9a5d109be766c11ef94c763e3e81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa009daa51d5789a8ad9b67aa9c793de83b8db00d630f4b9196eebfc48daaf69bb5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba05c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894edb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a081222ae79c598e0e3804c38bc665f78bd57b3ab3b84f9f5395e5230b8804817c88d4cb30d43703fcd6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094fb407a4280fee3609b54f73e3159705d2f9a5d109be766c11ef94c763e3e81a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a0f9e5e60d730930be766bb819b75ae3714acaf34346261a1de6f1cfb89df26fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a03e74c08efb6ff713f9625fa8c11ed1289bbdea8a03ffc30f094fc02db6c8ee3d88c2cc67df0ffe845ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23e1909199d77c500507be532ca9895599aa164984bd19fa7600719e6dfadf74",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8d9f9b61c0b6fb1ead68baecb1128b83b66d6d111ad5239da1515143e37f9768",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55390",
+                "balance" : "0x4563918244f55624",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76125d0",
+                "balance" : "0x0de0b6b3a761233c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallRipemd160_2_d0g0v0_Homestead" : {
+    "CallRipemd160_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x8e018e69231b9dd929c4ac89224385308fb9d2e831c91e0a0dc425ace91621f5",
+                    "mixHash" : "0x2296b88a70c5454a9e3ffe2d62e0db0ca9c722a21b8f624261efc8c7d8623012",
+                    "nonce" : "0xb064167cb86d6669",
+                    "number" : "0x01",
+                    "parentHash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
+                    "receiptTrie" : "0x458701d847e091d39c8841ce846d4112b76d6ce28ff4cac51912b0ad3a162511",
+                    "stateRoot" : "0xfd3d2f63b7c09cd3386b6e74f42f99963b7d45dd575e6f05288a64faaa8d75a4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd3d2f63b7c09cd3386b6e74f42f99963b7d45dd575e6f05288a64faaa8d75a4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0458701d847e091d39c8841ce846d4112b76d6ce28ff4cac51912b0ad3a162511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a02296b88a70c5454a9e3ffe2d62e0db0ca9c722a21b8f624261efc8c7d862301288b064167cb86d6669f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8e018e69231b9dd929c4ac89224385308fb9d2e831c91e0a0dc425ace91621f5",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600552602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xdbc100f916bfbc53535573d98cf0cbb3a5b36124",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f600552602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_2_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/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015390",
-                    "hash" : "0xe1e1b89b6e6ee2ffebf9d63bde06a71f7a92491d822413bda9f1c9804188a3a8",
-                    "mixHash" : "0xf19854eb642d14fee4fa298ad4d1aba7f952a147156a4e4c0ae0c677915d02c9",
-                    "nonce" : "0x8e80f3a7f2ce7da7",
+                    "hash" : "0x215916e6cbdd1683bd0c9368cb5f3fac539ffe4ec771c92fe62b37e76f72625a",
+                    "mixHash" : "0xe8df0788e2d29e205795f05f77198e80c0c0d399d092ef72163284a3ff6e2482",
+                    "nonce" : "0xc7d6f7003da74de8",
                     "number" : "0x01",
                     "parentHash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
                     "receiptTrie" : "0x5c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894ed",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa009daa51d5789a8ad9b67aa9c793de83b8db00d630f4b9196eebfc48daaf69bb5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba05c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894edb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0f19854eb642d14fee4fa298ad4d1aba7f952a147156a4e4c0ae0c677915d02c9888e80f3a7f2ce7da7f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa009daa51d5789a8ad9b67aa9c793de83b8db00d630f4b9196eebfc48daaf69bb5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba05c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894edb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0e8df0788e2d29e205795f05f77198e80c0c0d399d092ef72163284a3ff6e248288c7d6f7003da74de8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1e1b89b6e6ee2ffebf9d63bde06a71f7a92491d822413bda9f1c9804188a3a8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x215916e6cbdd1683bd0c9368cb5f3fac539ffe4ec771c92fe62b37e76f72625a",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallRipemd160_2_d0g0v0_Metropolis" : {
+    "CallRipemd160_2_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/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0x12c9eaea6f19cd2e679bfe8cc9d77899ef743ba6e1137bf32e60474f9bd1d72e",
-                    "mixHash" : "0x198bcb02976528982a3741bd8534b96e0ddae31b4f656ea9eae4752fcbb3286f",
-                    "nonce" : "0x090f146f6ef83585",
+                    "gasUsed" : "0x015390",
+                    "hash" : "0x73338e5bbf906ea45b7f8314c65ee10b792714ba91fc900f05b8031813ff585a",
+                    "mixHash" : "0xc6aa486ae02e170d23879a23d50e6d1a58b8e8021097166f3387decda2b58605",
+                    "nonce" : "0x389bda67496d6bea",
                     "number" : "0x01",
                     "parentHash" : "0x18a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0xd1c879164d0bff2e81e2ae8fd610dd6ac3330d14516216f518f0737caf623a82",
+                    "receiptTrie" : "0x5c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894ed",
+                    "stateRoot" : "0x09daa51d5789a8ad9b67aa9c793de83b8db00d630f4b9196eebfc48daaf69bb5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1c879164d0bff2e81e2ae8fd610dd6ac3330d14516216f518f0737caf623a82a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0198bcb02976528982a3741bd8534b96e0ddae31b4f656ea9eae4752fcbb3286f88090f146f6ef83585f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a018a5ab958910d100329ac9309613a46eccf4ffb18d12ac0021d6fa4925489984a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa009daa51d5789a8ad9b67aa9c793de83b8db00d630f4b9196eebfc48daaf69bb5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba05c83a9920fe8339405ef98e817e64906da6a02a4a4f364174d026c8fc06894edb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0c6aa486ae02e170d23879a23d50e6d1a58b8e8021097166f3387decda2b5860588389bda67496d6beaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0872d8b1765ada556f7485322bd349afd86efb63136e7579ca3c520f2208c08e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12c9eaea6f19cd2e679bfe8cc9d77899ef743ba6e1137bf32e60474f9bd1d72e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x73338e5bbf906ea45b7f8314c65ee10b792714ba91fc900f05b8031813ff585a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f55390",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a76125d0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_d0g0v0.json
index c2849e888..c01ce54de 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_3_d0g0v0_EIP150" : {
+    "CallRipemd160_3_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/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015624",
-                    "hash" : "0xb0f521979774e97d2acae509241a01925b62d5f4f2fba8e3e2a4e68932de12d2",
-                    "mixHash" : "0x1deb0086c0993759d13b142975941ffe411262c2de68113e0a2e2465ead97f44",
-                    "nonce" : "0x6d400f9bfc4dd699",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x944784f865408c1f746e786c2db8b102cff6b0d926afedd9c5ec10cb3668ec8d",
+                    "mixHash" : "0x6d1c97e9d05ddc036c927024a518ccd1e9c7b7ce31f48691b9df2be399801833",
+                    "nonce" : "0xef9b61cb4bd74694",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0xa9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887",
-                    "stateRoot" : "0x5a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x6facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a01deb0086c0993759d13b142975941ffe411262c2de68113e0a2e2465ead97f44886d400f9bfc4dd699f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a06d1c97e9d05ddc036c927024a518ccd1e9c7b7ce31f48691b9df2be39980183388ef9b61cb4bd74694f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0f521979774e97d2acae509241a01925b62d5f4f2fba8e3e2a4e68932de12d2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x944784f865408c1f746e786c2db8b102cff6b0d926afedd9c5ec10cb3668ec8d",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55624",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761233c",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallRipemd160_3_d0g0v0_EIP158" : {
+    "CallRipemd160_3_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/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0xffb21ee9f2720d319be820b302c7082ca45f9b10a5ff1e76173dc66946598d87",
-                    "mixHash" : "0x7f04698915ba211e8fa539863d296435ae32e4dee119f585d2e1f19663f17301",
-                    "nonce" : "0xb85b5627099e3135",
+                    "hash" : "0xba897e550d994e1720541398b9fc9800984a39635c09ae9a3c8c7da9501be413",
+                    "mixHash" : "0xdecdc2979e78a7945b5b860a4d4a53cfe37469c27eefe26cc9214a07a46fc4a6",
+                    "nonce" : "0xb48e2ddc491285e3",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0x1b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132",
-                    "stateRoot" : "0x73f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0a",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x6facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a07f04698915ba211e8fa539863d296435ae32e4dee119f585d2e1f19663f1730188b85b5627099e3135f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0decdc2979e78a7945b5b860a4d4a53cfe37469c27eefe26cc9214a07a46fc4a688b48e2ddc491285e3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffb21ee9f2720d319be820b302c7082ca45f9b10a5ff1e76173dc66946598d87",
-        "network" : "EIP158",
+        "lastblockhash" : "0xba897e550d994e1720541398b9fc9800984a39635c09ae9a3c8c7da9501be413",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallRipemd160_3_d0g0v0_Frontier" : {
+    "CallRipemd160_3_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/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015390",
-                    "hash" : "0x4b0efc881e16a768f2ca55dc2804eeaa4c96d8d4948c54326aa60c720f48a020",
-                    "mixHash" : "0x7423ca9b9d0db75141815299a445b60a45e3c30ed64beb34a204e65d0805cc2e",
-                    "nonce" : "0x12e7525674c0f2a1",
+                    "gasUsed" : "0x015624",
+                    "hash" : "0x8bab8dda3bc4e61f139a3e03ed3d617cb54f24fbbf9bd77b1a7cc2130fa00d0b",
+                    "mixHash" : "0x06bcd2880665f4172ce0ca57154f7a58ee99000492f96d68c0060f023e90de64",
+                    "nonce" : "0x4a9526a78be1d848",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0x947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ff",
-                    "stateRoot" : "0xfafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21",
+                    "receiptTrie" : "0xa9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887",
+                    "stateRoot" : "0x5a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a07423ca9b9d0db75141815299a445b60a45e3c30ed64beb34a204e65d0805cc2e8812e7525674c0f2a1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a006bcd2880665f4172ce0ca57154f7a58ee99000492f96d68c0060f023e90de64884a9526a78be1d848f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b0efc881e16a768f2ca55dc2804eeaa4c96d8d4948c54326aa60c720f48a020",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8bab8dda3bc4e61f139a3e03ed3d617cb54f24fbbf9bd77b1a7cc2130fa00d0b",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55390",
+                "balance" : "0x4563918244f55624",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76125d0",
+                "balance" : "0x0de0b6b3a761233c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallRipemd160_3_d0g0v0_Homestead" : {
+    "CallRipemd160_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x6e6f24c670970015b0b8641433eb52e126c3347d4e92393bf1553d8f317ea623",
+                    "mixHash" : "0x1a844b0bcae1201932e299a646f4b74340cdd37b1fe8e1c265dd1c6ac423c81c",
+                    "nonce" : "0xa8c05c311acc50ca",
+                    "number" : "0x01",
+                    "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
+                    "receiptTrie" : "0x1b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132",
+                    "stateRoot" : "0x73f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a01a844b0bcae1201932e299a646f4b74340cdd37b1fe8e1c265dd1c6ac423c81c88a8c05c311acc50caf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6e6f24c670970015b0b8641433eb52e126c3347d4e92393bf1553d8f317ea623",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_3_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/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015390",
-                    "hash" : "0x035a70d5ad14e31c8181af001ea6c84bc35c1dfa4e50ed1a12955f7218505abf",
-                    "mixHash" : "0x5649a42b057ba00b042d1a9994c8a1fc8e30a2d8d906b7510b0d5519ce40e0dc",
-                    "nonce" : "0xe359754cbef56993",
+                    "hash" : "0x03bea574de0758722c6c789806868771d8a59a882af74d635163b777534947da",
+                    "mixHash" : "0x6cecda217bb29fe9a0b05311f072166a3b6048ad650c689516dc456661d23db2",
+                    "nonce" : "0x8d30617b40fe4827",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
                     "receiptTrie" : "0x947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ff",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a05649a42b057ba00b042d1a9994c8a1fc8e30a2d8d906b7510b0d5519ce40e0dc88e359754cbef56993f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a06cecda217bb29fe9a0b05311f072166a3b6048ad650c689516dc456661d23db2888d30617b40fe4827f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x035a70d5ad14e31c8181af001ea6c84bc35c1dfa4e50ed1a12955f7218505abf",
-        "network" : "Homestead",
+        "lastblockhash" : "0x03bea574de0758722c6c789806868771d8a59a882af74d635163b777534947da",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallRipemd160_3_d0g0v0_Metropolis" : {
+    "CallRipemd160_3_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/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0xcd431b46ce5e846e6f412c8f2c8ed01e84979992f40b820d618136304b9939ea",
-                    "mixHash" : "0x982da9318eb27fb33b0b5e2656594074d88fdec988eff07dfcbde9cf655452c2",
-                    "nonce" : "0x81a1c0099d6ac7ce",
+                    "gasUsed" : "0x015390",
+                    "hash" : "0xcb3b28cfcd31e74281f2cd64884c33407a08f093f164b204e58d64fe868394da",
+                    "mixHash" : "0xd91ea240260ada68b38b877e9b041bbb64ec0c7a94bcc132854e0dcf2501bb12",
+                    "nonce" : "0xe3f4f0a356c53351",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x6facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301d",
+                    "receiptTrie" : "0x947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ff",
+                    "stateRoot" : "0xfafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0982da9318eb27fb33b0b5e2656594074d88fdec988eff07dfcbde9cf655452c28881a1c0099d6ac7cef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0d91ea240260ada68b38b877e9b041bbb64ec0c7a94bcc132854e0dcf2501bb1288e3f4f0a356c53351f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd431b46ce5e846e6f412c8f2c8ed01e84979992f40b820d618136304b9939ea",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcb3b28cfcd31e74281f2cd64884c33407a08f093f164b204e58d64fe868394da",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f55390",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a76125d0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0.json
index 585fbefc9..5d8fb9b2f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_3_postfixed0_d0g0v0_EIP150" : {
+    "CallRipemd160_3_postfixed0_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/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015624",
-                    "hash" : "0xc8eae591022169115e2ebf12dcbb99bf3be951ed25835683453d611927f0bb0e",
-                    "mixHash" : "0xd66a61401aeb9f3cdd9fbda6b8d67262706694ac1e941f146f29605c23e66ec8",
-                    "nonce" : "0x8a75efe7ea9d801e",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x97248e0d88635d3c03a66daa0f798820fb9b79917cf0d35ddc8232cb862ca9b0",
+                    "mixHash" : "0x858bf23188cc1c5e3441e8a0de39dc263c6a72f193b4d576ad75d927167c14d6",
+                    "nonce" : "0x93b117e891f64a7c",
                     "number" : "0x01",
                     "parentHash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
-                    "receiptTrie" : "0xb1a05082e196975bb9b7450c1681faf7d5b5479b5012e71d89ae43408e53f4fb",
-                    "stateRoot" : "0x4f1b37f9fd7030d8d4b8c54f081f52ca26feccdd39a8dd145c988444d8412957",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x7fa80ce3ac10cc6ae6157912152b1ad648450236c3ef1312cded3b2804232457",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f1b37f9fd7030d8d4b8c54f081f52ca26feccdd39a8dd145c988444d8412957a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1a05082e196975bb9b7450c1681faf7d5b5479b5012e71d89ae43408e53f4fbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a0d66a61401aeb9f3cdd9fbda6b8d67262706694ac1e941f146f29605c23e66ec8888a75efe7ea9d801ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07fa80ce3ac10cc6ae6157912152b1ad648450236c3ef1312cded3b2804232457a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0858bf23188cc1c5e3441e8a0de39dc263c6a72f193b4d576ad75d927167c14d68893b117e891f64a7cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8eae591022169115e2ebf12dcbb99bf3be951ed25835683453d611927f0bb0e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x97248e0d88635d3c03a66daa0f798820fb9b79917cf0d35ddc8232cb862ca9b0",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55624",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761233c",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallRipemd160_3_postfixed0_d0g0v0_EIP158" : {
+    "CallRipemd160_3_postfixed0_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/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0xedf44a14ef445c7a8020c56471d76b07eb9045aa3895baaadf19c78efc7f0202",
-                    "mixHash" : "0xa3952a532c7965a65703d37baff11b01c4a12481ed1b08c12f616861bf5a3528",
-                    "nonce" : "0x27ab026222aa7012",
+                    "hash" : "0x919cd0a0ac18a77cee0711aa2d464c8d27ea397dbf8e5027d1f8e2fe2987b820",
+                    "mixHash" : "0x57bf2203946f28282b3dc874319cf43e64ac80bc7ceb1aea90df3897681bebc9",
+                    "nonce" : "0x9021dc9a61b0b4ec",
                     "number" : "0x01",
                     "parentHash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
-                    "receiptTrie" : "0x634e3eae3c7d1415b47e12759640db3489b1d4c2f4e060629f61badd75138456",
-                    "stateRoot" : "0x86b850cd82ee061172d2011770653c4a4154ec078ec2f3805fde1831b3fc4950",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x7fa80ce3ac10cc6ae6157912152b1ad648450236c3ef1312cded3b2804232457",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086b850cd82ee061172d2011770653c4a4154ec078ec2f3805fde1831b3fc4950a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0634e3eae3c7d1415b47e12759640db3489b1d4c2f4e060629f61badd75138456b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0a3952a532c7965a65703d37baff11b01c4a12481ed1b08c12f616861bf5a35288827ab026222aa7012f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07fa80ce3ac10cc6ae6157912152b1ad648450236c3ef1312cded3b2804232457a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a057bf2203946f28282b3dc874319cf43e64ac80bc7ceb1aea90df3897681bebc9889021dc9a61b0b4ecf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedf44a14ef445c7a8020c56471d76b07eb9045aa3895baaadf19c78efc7f0202",
-        "network" : "EIP158",
+        "lastblockhash" : "0x919cd0a0ac18a77cee0711aa2d464c8d27ea397dbf8e5027d1f8e2fe2987b820",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x65f34578907f00600052602060006025600060006003611770f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallRipemd160_3_postfixed0_d0g0v0_Frontier" : {
+    "CallRipemd160_3_postfixed0_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/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015390",
-                    "hash" : "0x3ff3bdc0ee5f00f03be2375a5c8c999c9191e00049a7f7e2394ad648200f3da9",
-                    "mixHash" : "0xddb3b82e0a01666b3e64fa200a54672e2e99c0b83865a25a88e9b4dcc47c081b",
-                    "nonce" : "0xa25285c432ab818d",
+                    "gasUsed" : "0x015624",
+                    "hash" : "0x87f6cbf8d061495aa10100ada95c9a3905542ff087c5b03e430defe42411356a",
+                    "mixHash" : "0x985d400d3236d86ce004db9e67578e405b34aae77b8e5cdc0f023ced9f29fe87",
+                    "nonce" : "0x9a13a665493ad8ff",
                     "number" : "0x01",
                     "parentHash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
-                    "receiptTrie" : "0x64b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3",
-                    "stateRoot" : "0x47d542def84d51ef6dd7332470e35257e4f5bd7cda15f55fe6e445a8b8d4b7ad",
+                    "receiptTrie" : "0xb1a05082e196975bb9b7450c1681faf7d5b5479b5012e71d89ae43408e53f4fb",
+                    "stateRoot" : "0x4f1b37f9fd7030d8d4b8c54f081f52ca26feccdd39a8dd145c988444d8412957",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047d542def84d51ef6dd7332470e35257e4f5bd7cda15f55fe6e445a8b8d4b7ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0ddb3b82e0a01666b3e64fa200a54672e2e99c0b83865a25a88e9b4dcc47c081b88a25285c432ab818df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f1b37f9fd7030d8d4b8c54f081f52ca26feccdd39a8dd145c988444d8412957a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b1a05082e196975bb9b7450c1681faf7d5b5479b5012e71d89ae43408e53f4fbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a0985d400d3236d86ce004db9e67578e405b34aae77b8e5cdc0f023ced9f29fe87889a13a665493ad8fff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ff3bdc0ee5f00f03be2375a5c8c999c9191e00049a7f7e2394ad648200f3da9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x87f6cbf8d061495aa10100ada95c9a3905542ff087c5b03e430defe42411356a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55390",
+                "balance" : "0x4563918244f55624",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76125d0",
+                "balance" : "0x0de0b6b3a761233c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallRipemd160_3_postfixed0_d0g0v0_Homestead" : {
+    "CallRipemd160_3_postfixed0_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x68592c5c1e149724c2379941531f6ced0af420e9de61f7b7efb8a1b5b3a52389",
+                    "mixHash" : "0xea20eefcb45f970d261d1e8ef25360ad42f83583f7eda250476c40b0fa3a6c42",
+                    "nonce" : "0xd8764904141a15b6",
+                    "number" : "0x01",
+                    "parentHash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
+                    "receiptTrie" : "0x634e3eae3c7d1415b47e12759640db3489b1d4c2f4e060629f61badd75138456",
+                    "stateRoot" : "0x86b850cd82ee061172d2011770653c4a4154ec078ec2f3805fde1831b3fc4950",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086b850cd82ee061172d2011770653c4a4154ec078ec2f3805fde1831b3fc4950a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0634e3eae3c7d1415b47e12759640db3489b1d4c2f4e060629f61badd75138456b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0ea20eefcb45f970d261d1e8ef25360ad42f83583f7eda250476c40b0fa3a6c4288d8764904141a15b6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x70cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x68592c5c1e149724c2379941531f6ced0af420e9de61f7b7efb8a1b5b3a52389",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x65f34578907f00600052602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7730b4642169b0f16752696da8da830a4b429c9d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x65f34578907f00600052602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_3_postfixed0_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/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015390",
-                    "hash" : "0xd64981d504db02b3b2ab49005792972bbf07a5f4440f98d4ffb08f764d2fd492",
-                    "mixHash" : "0xe48ac0a09a883e42b0c1eb5b98345cff1e88db5f9fdb19328ad481754120b3e6",
-                    "nonce" : "0xd3e6ca441622a918",
+                    "hash" : "0x342af9011a42fb50300436c35107f67bc46d1cad324882df5dcaee01c5bcb7eb",
+                    "mixHash" : "0x4644ccaf1670f018b27c9fce0570332f6f016c99c22337733a9a5c4edcd566e1",
+                    "nonce" : "0xa730ca83242df509",
                     "number" : "0x01",
                     "parentHash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
                     "receiptTrie" : "0x64b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047d542def84d51ef6dd7332470e35257e4f5bd7cda15f55fe6e445a8b8d4b7ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0e48ac0a09a883e42b0c1eb5b98345cff1e88db5f9fdb19328ad481754120b3e688d3e6ca441622a918f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047d542def84d51ef6dd7332470e35257e4f5bd7cda15f55fe6e445a8b8d4b7ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a04644ccaf1670f018b27c9fce0570332f6f016c99c22337733a9a5c4edcd566e188a730ca83242df509f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd64981d504db02b3b2ab49005792972bbf07a5f4440f98d4ffb08f764d2fd492",
-        "network" : "Homestead",
+        "lastblockhash" : "0x342af9011a42fb50300436c35107f67bc46d1cad324882df5dcaee01c5bcb7eb",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallRipemd160_3_postfixed0_d0g0v0_Metropolis" : {
+    "CallRipemd160_3_postfixed0_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/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0x52f2b61e1a7b5a2779506ddc921865ca743b228c242b9e6b48148866fb06a143",
-                    "mixHash" : "0x3193e26c970b073d10df33d2fdf0257b60bb634c6be5f29162c9038c14f075e5",
-                    "nonce" : "0x2f00e051bee6a784",
+                    "gasUsed" : "0x015390",
+                    "hash" : "0x42f70ec7d930f1719ce607e240e03d7e989cf66e1dd3d83316f00d546f887338",
+                    "mixHash" : "0x9850a1ec767d0cac7bc9aa5d92ddd89e9ff3c2070a25dbf8996f980d350983b2",
+                    "nonce" : "0xe7de4784122a1b50",
                     "number" : "0x01",
                     "parentHash" : "0x2b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fb",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x7fa80ce3ac10cc6ae6157912152b1ad648450236c3ef1312cded3b2804232457",
+                    "receiptTrie" : "0x64b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3",
+                    "stateRoot" : "0x47d542def84d51ef6dd7332470e35257e4f5bd7cda15f55fe6e445a8b8d4b7ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07fa80ce3ac10cc6ae6157912152b1ad648450236c3ef1312cded3b2804232457a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a03193e26c970b073d10df33d2fdf0257b60bb634c6be5f29162c9038c14f075e5882f00e051bee6a784f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a02b693afbe327d8f485cdc075c4f64ea79adf76283d83edd03e7725aae191c6fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047d542def84d51ef6dd7332470e35257e4f5bd7cda15f55fe6e445a8b8d4b7ada098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba064b450148d6ea6686a97845b133711ecfb79b81e2cc13c6c01e3668a958775a3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a09850a1ec767d0cac7bc9aa5d92ddd89e9ff3c2070a25dbf8996f980d350983b288e7de4784122a1b50f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070cd5197512f1584956ee5d2b0d075cd92a5b82eb8d178071ba59c3de38f6282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52f2b61e1a7b5a2779506ddc921865ca743b228c242b9e6b48148866fb06a143",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x42f70ec7d930f1719ce607e240e03d7e989cf66e1dd3d83316f00d546f887338",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f55390",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a76125d0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0.json
index 7d1cb9eba..34cf0cad8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_3_prefixed0_d0g0v0_EIP150" : {
+    "CallRipemd160_3_prefixed0_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/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015624",
-                    "hash" : "0x41fc4989b84a4e1c7a3a5fb759b8b9ccf6bcb378eca412abfdd1e9ef1ca183da",
-                    "mixHash" : "0x13501152d8479d2745944e68121b5cae24e565b71b975123f1f1ccd816e8b0b9",
-                    "nonce" : "0x47d1921a70fca1e8",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x614dd8f47eda9cb2de2d324476e4daef4c6acd65e4d078b81091dabe2b895337",
+                    "mixHash" : "0xd8f4bc8aaf7c1f1e5d5d492a67755962896bb79f3f9281630b0c47ebcb9ac4de",
+                    "nonce" : "0x953bf7443c8e888c",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0xa9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887",
-                    "stateRoot" : "0x5a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x6facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a013501152d8479d2745944e68121b5cae24e565b71b975123f1f1ccd816e8b0b98847d1921a70fca1e8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0d8f4bc8aaf7c1f1e5d5d492a67755962896bb79f3f9281630b0c47ebcb9ac4de88953bf7443c8e888cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41fc4989b84a4e1c7a3a5fb759b8b9ccf6bcb378eca412abfdd1e9ef1ca183da",
-        "network" : "EIP150",
+        "lastblockhash" : "0x614dd8f47eda9cb2de2d324476e4daef4c6acd65e4d078b81091dabe2b895337",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55624",
+                "balance" : "0x4563918244f4f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761233c",
+                "balance" : "0x0de0b6b3a76184e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallRipemd160_3_prefixed0_d0g0v0_EIP158" : {
+    "CallRipemd160_3_prefixed0_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/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf47c",
-                    "hash" : "0xbafbdf9c90da202c28d2c379ffb2f33032b49463141e6efa506fa5f95e427e78",
-                    "mixHash" : "0xbc9ef8a5f9c5e1d939ea79954a48650b03fd8e3efa8b07ba63b4933bf2d9f69b",
-                    "nonce" : "0x96c14195acef543e",
+                    "hash" : "0x0cc737894a0afa40e91bf31f2bbb495eba11212223d37d760299fcee434fac0b",
+                    "mixHash" : "0x19463e468658319508d4741d8d09a12cf23c987f7ec94dac69eeeff84a4ba1c3",
+                    "nonce" : "0x100ae148acc93762",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0x1b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132",
-                    "stateRoot" : "0x73f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0a",
+                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
+                    "stateRoot" : "0x6facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0bc9ef8a5f9c5e1d939ea79954a48650b03fd8e3efa8b07ba63b4933bf2d9f69b8896c14195acef543ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a019463e468658319508d4741d8d09a12cf23c987f7ec94dac69eeeff84a4ba1c388100ae148acc93762f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbafbdf9c90da202c28d2c379ffb2f33032b49463141e6efa506fa5f95e427e78",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0cc737894a0afa40e91bf31f2bbb495eba11212223d37d760299fcee434fac0b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallRipemd160_3_prefixed0_d0g0v0_Frontier" : {
+    "CallRipemd160_3_prefixed0_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/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015390",
-                    "hash" : "0xdea045435cf9f70dae828aa0013b018d54f4ae12d7e0925cde36cfc5c6c863a4",
-                    "mixHash" : "0x47889b906b16462e84cb218fad787df6cd4c49f4173dc796d2caa003a0e39b0f",
-                    "nonce" : "0x7b7739766cd4584a",
+                    "gasUsed" : "0x015624",
+                    "hash" : "0x7ee1e2ed79ce0c70d354a340a5e57a449f206ecc86e9b4ed3d3b1529a1012794",
+                    "mixHash" : "0xcd745132eb1e5de3220a1f6f25bad4837c64f9160269d872bbddf7437afb8842",
+                    "nonce" : "0x5127bcb2fd455f9e",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0x947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ff",
-                    "stateRoot" : "0xfafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21",
+                    "receiptTrie" : "0xa9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887",
+                    "stateRoot" : "0x5a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a047889b906b16462e84cb218fad787df6cd4c49f4173dc796d2caa003a0e39b0f887b7739766cd4584af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a7321040d73498d4bc855e0e9f76394af90e88df6fdac05a89709fb308b5199a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a9a8efe132723d7cd6975d8530d6072bb6aefa500bc76e8cee5f2b0d2e828887b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156248203e880a0cd745132eb1e5de3220a1f6f25bad4837c64f9160269d872bbddf7437afb8842885127bcb2fd455f9ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdea045435cf9f70dae828aa0013b018d54f4ae12d7e0925cde36cfc5c6c863a4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7ee1e2ed79ce0c70d354a340a5e57a449f206ecc86e9b4ed3d3b1529a1012794",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55390",
+                "balance" : "0x4563918244f55624",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76125d0",
+                "balance" : "0x0de0b6b3a761233c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallRipemd160_3_prefixed0_d0g0v0_Homestead" : {
+    "CallRipemd160_3_prefixed0_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf47c",
+                    "hash" : "0x12907e4baf86070e95102ed112f305e51b5afa5223a97ace05f47885f53ae895",
+                    "mixHash" : "0x4c96813cc32189a9a9ef119e618e8330931f96d69c824e6a637cb49a4d889736",
+                    "nonce" : "0x46384e8ab64b2232",
+                    "number" : "0x01",
+                    "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
+                    "receiptTrie" : "0x1b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132",
+                    "stateRoot" : "0x73f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f43f56562a4ea6a462b99bc8c13a2e48732de785e882a877fcc48b295c3f0aa098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01b5f4a49deb842f1bc54226400724ce0e9ffe83f18889fcf3bd73479fd5d6132b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a04c96813cc32189a9a9ef119e618e8330931f96d69c824e6a637cb49a4d8897368846384e8ab64b2232f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x12907e4baf86070e95102ed112f305e51b5afa5223a97ace05f47885f53ae895",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f47c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76184e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_3_prefixed0_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/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015390",
-                    "hash" : "0xcb0c3143f9843fdc1e4572792ad470a8379746caf4ca8e37ce519873bffc25ba",
-                    "mixHash" : "0x34aa0098a1a7d7456ed7eca6178f6eb3afbc91fa08cc4127f8a8384fda933147",
-                    "nonce" : "0x5b2f2f99ca1adbd3",
+                    "hash" : "0x89eeb362118118908a07b2ecc1734a1068c710b263b98e5b44806cdc22785dd8",
+                    "mixHash" : "0xeb92395e024ea61409eba75863b9533f77c2eb70f197635bbda2eddff8bd32c3",
+                    "nonce" : "0x3512215a7016f276",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
                     "receiptTrie" : "0x947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ff",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a034aa0098a1a7d7456ed7eca6178f6eb3afbc91fa08cc4127f8a8384fda933147885b2f2f99ca1adbd3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a0eb92395e024ea61409eba75863b9533f77c2eb70f197635bbda2eddff8bd32c3883512215a7016f276f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb0c3143f9843fdc1e4572792ad470a8379746caf4ca8e37ce519873bffc25ba",
-        "network" : "Homestead",
+        "lastblockhash" : "0x89eeb362118118908a07b2ecc1734a1068c710b263b98e5b44806cdc22785dd8",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallRipemd160_3_prefixed0_d0g0v0_Metropolis" : {
+    "CallRipemd160_3_prefixed0_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/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf47c",
-                    "hash" : "0x78b225a620a1773c35492a4501abfaca27906b62f8bc4fee0516377c3c9b039a",
-                    "mixHash" : "0xc7a0b6fa6a24e15640a10cfda0799c21c7e5ea6fa405fe85e68db01ae0b5bf8d",
-                    "nonce" : "0xe380537c24cc0003",
+                    "gasUsed" : "0x015390",
+                    "hash" : "0xc7465937843d911b11e5d822c80feab5747f46078ba32f69eeab9dd32fe3fef8",
+                    "mixHash" : "0x00ea4048a0794639e76ad7b34f11be5df0cef39030962b5688f9e1a4f891bd3b",
+                    "nonce" : "0x3d6794f4a7fa9e6e",
                     "number" : "0x01",
                     "parentHash" : "0xeec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507",
-                    "receiptTrie" : "0xe4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48",
-                    "stateRoot" : "0x6facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301d",
+                    "receiptTrie" : "0x947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ff",
+                    "stateRoot" : "0xfafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06facacb68eb76ff1c4a7de2b203dc49fd3aa591694f0c290b766daf6ccc6301da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0e4264cbca827bc84f3012d6c737e1d86f07879539a32983fd80a939a73bdce48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f47c8203e880a0c7a0b6fa6a24e15640a10cfda0799c21c7e5ea6fa405fe85e68db01ae0b5bf8d88e380537c24cc0003f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0eec30abb9b013f8d7e9b8b40641ae68df6dd231ab0f7be7bdf45ba80ea3bb507a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fafe581b0bb8d28811ac3e752f562445f5af1b10725d1e69017709c8a0724b21a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0947b06fef5a81f0c822eaa9e186121dc7e718de9c8bcb1675efb133180a726ffb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153908203e880a000ea4048a0794639e76ad7b34f11be5df0cef39030962b5688f9e1a4f891bd3b883d6794f4a7fa9e6ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bc5b551bb78663f1e329653ff87a4e30e5f6bf332c257a6e8862ed0f107916ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78b225a620a1773c35492a4501abfaca27906b62f8bc4fee0516377c3c9b039a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc7465937843d911b11e5d822c80feab5747f46078ba32f69eeab9dd32fe3fef8",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f47c",
+                "balance" : "0x4563918244f55390",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76184e4",
+                "balance" : "0x0de0b6b3a76125d0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_d0g0v0.json
index dbe2c8473..1da27d31a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_4_d0g0v0_EIP150" : {
+    "CallRipemd160_4_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/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155a9",
-                    "hash" : "0x66937d5c1151a3304703ad019f838d0e0d35a6892d17a4ee465f0682bab96277",
-                    "mixHash" : "0x1557618a6af3eac3f30b3a607691138e4de12266e7bd980883bfe722295e423c",
-                    "nonce" : "0xa2fde3c623194b6c",
+                    "gasUsed" : "0xf401",
+                    "hash" : "0x48df2f69fa213872306c250606d8c060b9f70c09e6d536602732f3f772807782",
+                    "mixHash" : "0xcc36ddd7e99a4a7c701165a4395f65686fed77f5746d51a1bdd2f694e184c93f",
+                    "nonce" : "0xee40bcf3a73258bf",
                     "number" : "0x01",
                     "parentHash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
-                    "receiptTrie" : "0x059839805a2364e6e0b5535f60f76c50d18542206ec7cbbb5f9ea7fc4f6878d5",
-                    "stateRoot" : "0x9f25627d61ef6455966f2f3292edaaeebb1ff2e995ce0fd368994997559fa531",
+                    "receiptTrie" : "0x326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692",
+                    "stateRoot" : "0xa2d0160c0cf720cebc69fe28d43effb63b5905bda5f110783f93b65bea72fe07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f25627d61ef6455966f2f3292edaaeebb1ff2e995ce0fd368994997559fa531a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0059839805a2364e6e0b5535f60f76c50d18542206ec7cbbb5f9ea7fc4f6878d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155a98203e880a01557618a6af3eac3f30b3a607691138e4de12266e7bd980883bfe722295e423c88a2fde3c623194b6cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2d0160c0cf720cebc69fe28d43effb63b5905bda5f110783f93b65bea72fe07a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0cc36ddd7e99a4a7c701165a4395f65686fed77f5746d51a1bdd2f694e184c93f88ee40bcf3a73258bff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66937d5c1151a3304703ad019f838d0e0d35a6892d17a4ee465f0682bab96277",
-        "network" : "EIP150",
+        "lastblockhash" : "0x48df2f69fa213872306c250606d8c060b9f70c09e6d536602732f3f772807782",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555a9",
+                "balance" : "0x4563918244f4f401",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76123b7",
+                "balance" : "0x0de0b6b3a761855f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallRipemd160_4_d0g0v0_EIP158" : {
+    "CallRipemd160_4_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/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf401",
-                    "hash" : "0x75c9b47b41dbcf64e3c6413c585acdfa9a4b2df64157a2c0ca9454ab3cd8df43",
-                    "mixHash" : "0x8158f0279dfff96bf13769d4d42dcccac67cedcb33659d29c055d9ac6cf954cf",
-                    "nonce" : "0xc98fc7b6c6fe6d75",
+                    "hash" : "0x088339670937f50b0abf0dd3648f4d1ff847f3c6c75191288225626872105635",
+                    "mixHash" : "0xfd2553124ad87b3cfb787a2fabaf459e9661c2374a10162174a30a46604fbf1e",
+                    "nonce" : "0x8719a0972a438c7e",
                     "number" : "0x01",
                     "parentHash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
-                    "receiptTrie" : "0x2f38462d34ef721ea33eb1e2a8e9ba106f06357b42a392abb394a35b6a8b0398",
-                    "stateRoot" : "0xef5c4d1111d2a9b20b5b5b649941b3453a6e38a88cea1d8a952be1f6e3676b36",
+                    "receiptTrie" : "0x326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692",
+                    "stateRoot" : "0xa2d0160c0cf720cebc69fe28d43effb63b5905bda5f110783f93b65bea72fe07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef5c4d1111d2a9b20b5b5b649941b3453a6e38a88cea1d8a952be1f6e3676b36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02f38462d34ef721ea33eb1e2a8e9ba106f06357b42a392abb394a35b6a8b0398b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a08158f0279dfff96bf13769d4d42dcccac67cedcb33659d29c055d9ac6cf954cf88c98fc7b6c6fe6d75f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2d0160c0cf720cebc69fe28d43effb63b5905bda5f110783f93b65bea72fe07a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0fd2553124ad87b3cfb787a2fabaf459e9661c2374a10162174a30a46604fbf1e888719a0972a438c7ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75c9b47b41dbcf64e3c6413c585acdfa9a4b2df64157a2c0ca9454ab3cd8df43",
-        "network" : "EIP158",
+        "lastblockhash" : "0x088339670937f50b0abf0dd3648f4d1ff847f3c6c75191288225626872105635",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallRipemd160_4_d0g0v0_Frontier" : {
+    "CallRipemd160_4_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/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015315",
-                    "hash" : "0x4f4dc8a6cd0cdc26b3df5145e2cbfde007c009b1f5db4eafa2ab15ae9864765c",
-                    "mixHash" : "0xe2626b4e40691f75f147171191b7f1f4086ce902d9402406128add3323cbb5e8",
-                    "nonce" : "0xbe8e880c1f007e7c",
+                    "gasUsed" : "0x0155a9",
+                    "hash" : "0x87ee8c9469c1925a7dd653f09f39ff3ba6a6ddf0016de247ef5103ecf51e6986",
+                    "mixHash" : "0x3efc1bfa7c933fde3067d9049c3661cb5df1d68355a3e016873c309ac1ca978f",
+                    "nonce" : "0xf347b94dd8e5cdcb",
                     "number" : "0x01",
                     "parentHash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
-                    "receiptTrie" : "0xde169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82",
-                    "stateRoot" : "0x16c6b6b6423c7c5a09245aa4806905c08258da8bd960715839e20795d72d847d",
+                    "receiptTrie" : "0x059839805a2364e6e0b5535f60f76c50d18542206ec7cbbb5f9ea7fc4f6878d5",
+                    "stateRoot" : "0x9f25627d61ef6455966f2f3292edaaeebb1ff2e995ce0fd368994997559fa531",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016c6b6b6423c7c5a09245aa4806905c08258da8bd960715839e20795d72d847da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0de169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153158203e880a0e2626b4e40691f75f147171191b7f1f4086ce902d9402406128add3323cbb5e888be8e880c1f007e7cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f25627d61ef6455966f2f3292edaaeebb1ff2e995ce0fd368994997559fa531a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0059839805a2364e6e0b5535f60f76c50d18542206ec7cbbb5f9ea7fc4f6878d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155a98203e880a03efc1bfa7c933fde3067d9049c3661cb5df1d68355a3e016873c309ac1ca978f88f347b94dd8e5cdcbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f4dc8a6cd0cdc26b3df5145e2cbfde007c009b1f5db4eafa2ab15ae9864765c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x87ee8c9469c1925a7dd653f09f39ff3ba6a6ddf0016de247ef5103ecf51e6986",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55315",
+                "balance" : "0x4563918244f555a9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761264b",
+                "balance" : "0x0de0b6b3a76123b7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallRipemd160_4_d0g0v0_Homestead" : {
+    "CallRipemd160_4_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf401",
+                    "hash" : "0xb415e6ef447f79863a451de557bf46c00d252089ba669760bc77f2fadf5d2fa9",
+                    "mixHash" : "0xa3ce7d954e2ef545ff6a31da211d964979dd9897133945cf3178107f5b74b3df",
+                    "nonce" : "0x9dfe51f776808455",
+                    "number" : "0x01",
+                    "parentHash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
+                    "receiptTrie" : "0x2f38462d34ef721ea33eb1e2a8e9ba106f06357b42a392abb394a35b6a8b0398",
+                    "stateRoot" : "0xef5c4d1111d2a9b20b5b5b649941b3453a6e38a88cea1d8a952be1f6e3676b36",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef5c4d1111d2a9b20b5b5b649941b3453a6e38a88cea1d8a952be1f6e3676b36a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02f38462d34ef721ea33eb1e2a8e9ba106f06357b42a392abb394a35b6a8b0398b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0a3ce7d954e2ef545ff6a31da211d964979dd9897133945cf3178107f5b74b3df889dfe51f776808455f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb415e6ef447f79863a451de557bf46c00d252089ba669760bc77f2fadf5d2fa9",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f401",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761855f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_4_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/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015315",
-                    "hash" : "0x93475eedc5fed164eb3fcbf2785c0777fd468816af5e5ae525808be2a2c066c9",
-                    "mixHash" : "0x48276dc6d8a73f62239da66d8ea8a7ff42bfaa00c30be4caa6d5b5eeb3aa4167",
-                    "nonce" : "0xe52c5cb84dd654ab",
+                    "hash" : "0x930ec7ee71489630019079b895d618cb53f853d7f781fddc85a58c22cd6bad9c",
+                    "mixHash" : "0x5882c883406189b869de64cb5bf2f733dcd2c6d3a9494156dfb3ad4ca3647f2c",
+                    "nonce" : "0xbfc7152365fa3f21",
                     "number" : "0x01",
                     "parentHash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
                     "receiptTrie" : "0xde169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016c6b6b6423c7c5a09245aa4806905c08258da8bd960715839e20795d72d847da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0de169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153158203e880a048276dc6d8a73f62239da66d8ea8a7ff42bfaa00c30be4caa6d5b5eeb3aa416788e52c5cb84dd654abf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016c6b6b6423c7c5a09245aa4806905c08258da8bd960715839e20795d72d847da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0de169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153158203e880a05882c883406189b869de64cb5bf2f733dcd2c6d3a9494156dfb3ad4ca3647f2c88bfc7152365fa3f21f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93475eedc5fed164eb3fcbf2785c0777fd468816af5e5ae525808be2a2c066c9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x930ec7ee71489630019079b895d618cb53f853d7f781fddc85a58c22cd6bad9c",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallRipemd160_4_d0g0v0_Metropolis" : {
+    "CallRipemd160_4_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/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf401",
-                    "hash" : "0xe1eb7cf7ddecef88837342642774903f84e3afd1ddae6b0e522374e2445d0ed6",
-                    "mixHash" : "0xa39d1a8e73153177b27caf05d4ab21ecfb919bdfd46166bb567249c914ca6a0a",
-                    "nonce" : "0x61e612ecb012e202",
+                    "gasUsed" : "0x015315",
+                    "hash" : "0x93beaf99509bb8204e3a2b351085f1790915d5de5aae6a54a02091588260a56b",
+                    "mixHash" : "0xce569f53736a0badc378cdfc60c6db93e3263d211d7b8acb247803ac81f9335c",
+                    "nonce" : "0xda4b8e09601edd5d",
                     "number" : "0x01",
                     "parentHash" : "0x0c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52",
-                    "receiptTrie" : "0x326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692",
-                    "stateRoot" : "0xa2d0160c0cf720cebc69fe28d43effb63b5905bda5f110783f93b65bea72fe07",
+                    "receiptTrie" : "0xde169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82",
+                    "stateRoot" : "0x16c6b6b6423c7c5a09245aa4806905c08258da8bd960715839e20795d72d847d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2d0160c0cf720cebc69fe28d43effb63b5905bda5f110783f93b65bea72fe07a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0326a8170adc056337f17dba46d15b62e10c637de218050a59398c69e60f99692b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f4018203e880a0a39d1a8e73153177b27caf05d4ab21ecfb919bdfd46166bb567249c914ca6a0a8861e612ecb012e202f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00c7ee7d6b797d8d3e4f342515a2f927caa4341354b920622747a7bbb73c32e52a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016c6b6b6423c7c5a09245aa4806905c08258da8bd960715839e20795d72d847da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0de169074bf5342eb2bce68ee691cd46a7d3ef0f2d7f65e0b0419555e6d081c82b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153158203e880a0ce569f53736a0badc378cdfc60c6db93e3263d211d7b8acb247803ac81f9335c88da4b8e09601edd5df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01976352f36f39ebad24b5c517870d741c23007e7c6fe407f67c28a78c0398140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1eb7cf7ddecef88837342642774903f84e3afd1ddae6b0e522374e2445d0ed6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x93beaf99509bb8204e3a2b351085f1790915d5de5aae6a54a02091588260a56b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f401",
+                "balance" : "0x4563918244f55315",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761855f",
+                "balance" : "0x0de0b6b3a761264b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0.json
index 78ebae464..39b6ea84e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_4_gas719_d0g0v0_EIP150" : {
+    "CallRipemd160_4_gas719_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/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011b10",
-                    "hash" : "0xd36e82da8a9ebb7d1c8c6fd454885573b1d3b43208a87571c77bfdc6f3910bc4",
-                    "mixHash" : "0x1e921c8e5be7f67803a3c144136be64bd9b6fa9d8fef3e4a1fc0dd753bc93a1d",
-                    "nonce" : "0x0b64bfea1c5ebcd3",
+                    "gasUsed" : "0xb968",
+                    "hash" : "0x36617d13c492cec613a0d5e8edee47b407f5e6bb05d52baf9b6a15e8ef193729",
+                    "mixHash" : "0xe3c51bbb061be61114b6c6ca8f9634e73434938463f6521426f2bb8859dd3070",
+                    "nonce" : "0x6306a078b6cbbf35",
                     "number" : "0x01",
                     "parentHash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
-                    "receiptTrie" : "0x21bb963aa940f27f6f63b1a9531ed845029df9c5293b9901735d9d03c9f58274",
-                    "stateRoot" : "0xfb6ff6208788aa51708dfdb55a9cbf529b3e0559fa1d8ff4e7ef7b274137ebfb",
+                    "receiptTrie" : "0x950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40",
+                    "stateRoot" : "0xe56d2e885cbf265118986e6dd5403aac207d0228072db9296dd52e555acf9a22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb6ff6208788aa51708dfdb55a9cbf529b3e0559fa1d8ff4e7ef7b274137ebfba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba021bb963aa940f27f6f63b1a9531ed845029df9c5293b9901735d9d03c9f58274b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011b108203e880a01e921c8e5be7f67803a3c144136be64bd9b6fa9d8fef3e4a1fc0dd753bc93a1d880b64bfea1c5ebcd3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e56d2e885cbf265118986e6dd5403aac207d0228072db9296dd52e555acf9a22a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a0e3c51bbb061be61114b6c6ca8f9634e73434938463f6521426f2bb8859dd3070886306a078b6cbbf35f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd36e82da8a9ebb7d1c8c6fd454885573b1d3b43208a87571c77bfdc6f3910bc4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x36617d13c492cec613a0d5e8edee47b407f5e6bb05d52baf9b6a15e8ef193729",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51b10",
+                "balance" : "0x4563918244f4b968",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615e50",
+                "balance" : "0x0de0b6b3a761bff8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CallRipemd160_4_gas719_d0g0v0_EIP158" : {
+    "CallRipemd160_4_gas719_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/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xb968",
-                    "hash" : "0x0afa4dec02afeafdeff63c20d3f302eff90835f80aedd144529386728fc07d86",
-                    "mixHash" : "0x723523693f1878b6bd944391a8eae7e3f50f55c840483cab2d97370821d7a46a",
-                    "nonce" : "0x3b0e16a719d0709e",
+                    "hash" : "0x6dfa40d6f784b5b406d5f952c63bc6f5ae9074710595d67cacadfcda33715ff3",
+                    "mixHash" : "0x022c691bc1e3b3576d86034fc54677d1762696a0b803edb90b099ea1f145559e",
+                    "nonce" : "0x719dc8311327051e",
                     "number" : "0x01",
                     "parentHash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
-                    "receiptTrie" : "0xb33b6b799465c32c9fd298594ed3a8b39b31e90e70c2bb4bd1232e2d608c50c8",
-                    "stateRoot" : "0xe6004b29584f066515d0bbb049f9d284a7a1e4109cf2b729392d5fe9c3ecaa85",
+                    "receiptTrie" : "0x950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40",
+                    "stateRoot" : "0xe56d2e885cbf265118986e6dd5403aac207d0228072db9296dd52e555acf9a22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6004b29584f066515d0bbb049f9d284a7a1e4109cf2b729392d5fe9c3ecaa85a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b33b6b799465c32c9fd298594ed3a8b39b31e90e70c2bb4bd1232e2d608c50c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a0723523693f1878b6bd944391a8eae7e3f50f55c840483cab2d97370821d7a46a883b0e16a719d0709ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e56d2e885cbf265118986e6dd5403aac207d0228072db9296dd52e555acf9a22a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a0022c691bc1e3b3576d86034fc54677d1762696a0b803edb90b099ea1f145559e88719dc8311327051ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0afa4dec02afeafdeff63c20d3f302eff90835f80aedd144529386728fc07d86",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6dfa40d6f784b5b406d5f952c63bc6f5ae9074710595d67cacadfcda33715ff3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CallRipemd160_4_gas719_d0g0v0_Frontier" : {
+    "CallRipemd160_4_gas719_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/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01187c",
-                    "hash" : "0xf42c3315324243b5f1baf091efc40869d26bb1c5078644c61fdee3ae7134bd3c",
-                    "mixHash" : "0xc0ae6e3981fae6be8a5bd45c558591d6adf14d61fafef59c0910292fe7337e2b",
-                    "nonce" : "0x0464d23a27841d75",
+                    "gasUsed" : "0x011b10",
+                    "hash" : "0xb78b1d454f9f8f96b4de8dc476376e329062fc9d5a18efea8f0aeacd82607527",
+                    "mixHash" : "0x6efe93abd1018c29ba4b80d871b0a3714d52efc080e6ab38ac2a18b8b2b52f53",
+                    "nonce" : "0x7399f581236c64be",
                     "number" : "0x01",
                     "parentHash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
-                    "receiptTrie" : "0xa6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412",
-                    "stateRoot" : "0x429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1ae",
+                    "receiptTrie" : "0x21bb963aa940f27f6f63b1a9531ed845029df9c5293b9901735d9d03c9f58274",
+                    "stateRoot" : "0xfb6ff6208788aa51708dfdb55a9cbf529b3e0559fa1d8ff4e7ef7b274137ebfb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1aea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301187c8203e880a0c0ae6e3981fae6be8a5bd45c558591d6adf14d61fafef59c0910292fe7337e2b880464d23a27841d75f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb6ff6208788aa51708dfdb55a9cbf529b3e0559fa1d8ff4e7ef7b274137ebfba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba021bb963aa940f27f6f63b1a9531ed845029df9c5293b9901735d9d03c9f58274b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011b108203e880a06efe93abd1018c29ba4b80d871b0a3714d52efc080e6ab38ac2a18b8b2b52f53887399f581236c64bef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf42c3315324243b5f1baf091efc40869d26bb1c5078644c61fdee3ae7134bd3c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb78b1d454f9f8f96b4de8dc476376e329062fc9d5a18efea8f0aeacd82607527",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5187c",
+                "balance" : "0x4563918244f51b10",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76160e4",
+                "balance" : "0x0de0b6b3a7615e50",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CallRipemd160_4_gas719_d0g0v0_Homestead" : {
+    "CallRipemd160_4_gas719_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/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01187c",
-                    "hash" : "0xf1902cda99d4419b766af2757cd25c63dd081c50eab6ffa9bfe69410f107897c",
-                    "mixHash" : "0xc31507f29cb52ad2a5877975035db55c28f2f0ec9e5b392ff6cff31632c84ec5",
-                    "nonce" : "0x09c9d9a19e70b18f",
+                    "gasUsed" : "0xb968",
+                    "hash" : "0x4daefea66dfc59abb43e37267b2f6b813a26028254d415bd9de554ad2ad48c8b",
+                    "mixHash" : "0x7995e05177d6f1aabab82966065cb23b38ca4cfa5b6b43ec0c789541a97a0989",
+                    "nonce" : "0xbeca5fef49ceaf31",
                     "number" : "0x01",
                     "parentHash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
-                    "receiptTrie" : "0xa6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412",
-                    "stateRoot" : "0x429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1ae",
+                    "receiptTrie" : "0xb33b6b799465c32c9fd298594ed3a8b39b31e90e70c2bb4bd1232e2d608c50c8",
+                    "stateRoot" : "0xe6004b29584f066515d0bbb049f9d284a7a1e4109cf2b729392d5fe9c3ecaa85",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1aea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301187c8203e880a0c31507f29cb52ad2a5877975035db55c28f2f0ec9e5b392ff6cff31632c84ec58809c9d9a19e70b18ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6004b29584f066515d0bbb049f9d284a7a1e4109cf2b729392d5fe9c3ecaa85a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b33b6b799465c32c9fd298594ed3a8b39b31e90e70c2bb4bd1232e2d608c50c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a07995e05177d6f1aabab82966065cb23b38ca4cfa5b6b43ec0c789541a97a098988beca5fef49ceaf31f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1902cda99d4419b766af2757cd25c63dd081c50eab6ffa9bfe69410f107897c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4daefea66dfc59abb43e37267b2f6b813a26028254d415bd9de554ad2ad48c8b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5187c",
+                "balance" : "0x4563918244f4b968",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76160e4",
+                "balance" : "0x0de0b6b3a761bff8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CallRipemd160_4_gas719_d0g0v0_Metropolis" : {
+    "CallRipemd160_4_gas719_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/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xb968",
-                    "hash" : "0x8dbacf3ab6d30975fd196555718f7771a3a2811a58a2336eb14b1e1530a281fc",
-                    "mixHash" : "0x5d7c51fbd624a7706548d6f628a9506041ef8adaca0d665090d01335fd60be42",
-                    "nonce" : "0xd3279ca21a2c2d46",
+                    "gasUsed" : "0x01187c",
+                    "hash" : "0xb0ba4a9ec0ff0f8491b598c765a5a509cb89a58813329065f8d7ac07de119ac6",
+                    "mixHash" : "0x72cf93f170a0e13804b683168c64a2ddf27e1ca8e1554377b286af722a0a74d1",
+                    "nonce" : "0x4b4b9a4f3af8f617",
                     "number" : "0x01",
                     "parentHash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
-                    "receiptTrie" : "0x950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40",
-                    "stateRoot" : "0xe56d2e885cbf265118986e6dd5403aac207d0228072db9296dd52e555acf9a22",
+                    "receiptTrie" : "0xa6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412",
+                    "stateRoot" : "0x429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1ae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e56d2e885cbf265118986e6dd5403aac207d0228072db9296dd52e555acf9a22a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0950cdfd6e3b578040debdb97ba49c21a94752ddc2874515f052714f296025f40b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082b9688203e880a05d7c51fbd624a7706548d6f628a9506041ef8adaca0d665090d01335fd60be4288d3279ca21a2c2d46f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1aea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301187c8203e880a072cf93f170a0e13804b683168c64a2ddf27e1ca8e1554377b286af722a0a74d1884b4b9a4f3af8f617f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8dbacf3ab6d30975fd196555718f7771a3a2811a58a2336eb14b1e1530a281fc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb0ba4a9ec0ff0f8491b598c765a5a509cb89a58813329065f8d7ac07de119ac6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5187c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76160e4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_4_gas719_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01187c",
+                    "hash" : "0x2122ceb6d2eb1d7a3ebcf09745aeee783eac7a73593274dd41c72fd932c32233",
+                    "mixHash" : "0xbea125c8a09349dd41adb5c5172e159085f5288c720bd68d2e26cdd491ac1649",
+                    "nonce" : "0x95bd65b9fe7079b1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
+                    "receiptTrie" : "0xa6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412",
+                    "stateRoot" : "0x429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1ae",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0e87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0429dd6c61ca2046108ce3adcdea1f0947bc2eb8a6b2794f6ad042479f814c1aea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0a6345a08f00fded1aca51f3b8ffc11c358edecc729c512af883756b3b7199412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301187c8203e880a0bea125c8a09349dd41adb5c5172e159085f5288c720bd68d2e26cdd491ac16498895bd65b9fe7079b1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe87b032dc8ffba4eb709b9962b3b760451daad9f14e3f453afe02d6fcc630583",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09910eb60538c4601c4439a1c352f152a924af56545e7435f7b3409dd8905abdda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2122ceb6d2eb1d7a3ebcf09745aeee783eac7a73593274dd41c72fd932c32233",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b968",
+                "balance" : "0x4563918244f5187c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761bff8",
+                "balance" : "0x0de0b6b3a76160e4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5_d0g0v0.json
index 42d2ae93d..abe957bd6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRipemd160_5_d0g0v0_EIP150" : {
+    "CallRipemd160_5_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/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fb878",
-                    "hash" : "0xd3f2d4e5a529e09467466c4f4942d1b6216d334673a3de6410d170c97b1c4722",
-                    "mixHash" : "0x2ce22b70fa7778366d7ff112cef43dd0420b519596265e98187cd6b29d20143e",
-                    "nonce" : "0x21019a9e7338e9be",
+                    "gasUsed" : "0x1f56d0",
+                    "hash" : "0xcc331d43169fac383ea878d89ff9c0a0828a08eca070c42e11f0e7c8bc78ede1",
+                    "mixHash" : "0x9facaa14e641bbbdbf136948bab4f296c8e292cfaf6445bae8032462aeb48a9b",
+                    "nonce" : "0x6ae55669b85d38b4",
                     "number" : "0x01",
                     "parentHash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
-                    "receiptTrie" : "0x9808ae2d0fa27034b75c000c29d9dc5f77cfec91ccb66e65a4512dba0d33668e",
-                    "stateRoot" : "0x579df56673025a6bb1eb4b0197a8fc662b21d5a5c22c40e4838bf0a3505af0d6",
+                    "receiptTrie" : "0xcf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22d",
+                    "stateRoot" : "0x3599a9c4eaf70dc51516255d4cda3d6848ad8622221ac18e5c9d29b3c644e9e8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0579df56673025a6bb1eb4b0197a8fc662b21d5a5c22c40e4838bf0a3505af0d6a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a09808ae2d0fa27034b75c000c29d9dc5f77cfec91ccb66e65a4512dba0d33668eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fb8788203e880a02ce22b70fa7778366d7ff112cef43dd0420b519596265e98187cd6b29d20143e8821019a9e7338e9bef865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03599a9c4eaf70dc51516255d4cda3d6848ad8622221ac18e5c9d29b3c644e9e8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a09facaa14e641bbbdbf136948bab4f296c8e292cfaf6445bae8032462aeb48a9b886ae55669b85d38b4f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3f2d4e5a529e09467466c4f4942d1b6216d334673a3de6410d170c97b1c4722",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcc331d43169fac383ea878d89ff9c0a0828a08eca070c42e11f0e7c8bc78ede1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513b878",
+                "balance" : "0x45639182451356d0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742c0e8",
+                "balance" : "0x0de0b6b3a7432290",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CallRipemd160_5_d0g0v0_EIP158" : {
+    "CallRipemd160_5_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/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f56d0",
-                    "hash" : "0xda698d871364998e5c707131fdfeb396381202df20c621d0204406f3b10c9b1e",
-                    "mixHash" : "0xde94f583e0b6b94f1501d15c165a302073b2e0930401faa62c30729b318dd520",
-                    "nonce" : "0xb6f16fa98f9bd59b",
+                    "hash" : "0x46f7d7033159fa3760425c4d986f6e6a2c135b94aa78d768f0ee77dac3811260",
+                    "mixHash" : "0x2eb8a71f882c913ff6276a834171e77cfbd903bff754a4416bcb833db8f6e85b",
+                    "nonce" : "0xb95212092d3814da",
                     "number" : "0x01",
                     "parentHash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
-                    "receiptTrie" : "0x58cdffe0effa7979867247d1196ca952f73c4175a749871dc64bd7408ad38c7b",
-                    "stateRoot" : "0x69856da2e7dbc88135ba117f9c94ceafb1521807ca6ddd58f2f299edc23d3113",
+                    "receiptTrie" : "0xcf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22d",
+                    "stateRoot" : "0x3599a9c4eaf70dc51516255d4cda3d6848ad8622221ac18e5c9d29b3c644e9e8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069856da2e7dbc88135ba117f9c94ceafb1521807ca6ddd58f2f299edc23d3113a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a058cdffe0effa7979867247d1196ca952f73c4175a749871dc64bd7408ad38c7bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0de94f583e0b6b94f1501d15c165a302073b2e0930401faa62c30729b318dd52088b6f16fa98f9bd59bf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03599a9c4eaf70dc51516255d4cda3d6848ad8622221ac18e5c9d29b3c644e9e8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a02eb8a71f882c913ff6276a834171e77cfbd903bff754a4416bcb833db8f6e85b88b95212092d3814daf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda698d871364998e5c707131fdfeb396381202df20c621d0204406f3b10c9b1e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x46f7d7033159fa3760425c4d986f6e6a2c135b94aa78d768f0ee77dac3811260",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CallRipemd160_5_d0g0v0_Frontier" : {
+    "CallRipemd160_5_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/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fb5e4",
-                    "hash" : "0x81493cad025712a0e273363ca497731e9efc3b9faeee4d8f0b066491f61b7518",
-                    "mixHash" : "0x9fc97ceb9e2cb4358eccd483de6c6867e80717db82c803783f159166063e3171",
-                    "nonce" : "0xc39133aa03788502",
+                    "gasUsed" : "0x1fb878",
+                    "hash" : "0x596b94779b5fdba3e261301ee5b4a8a2adaa340942f1f75909da4905ef05192f",
+                    "mixHash" : "0x71967fd3cdb4a7aa6e6777f7f3f07f72d820d14f7587732bd1898beca6a15839",
+                    "nonce" : "0x6c0a5e0d73a4dea3",
                     "number" : "0x01",
                     "parentHash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
-                    "receiptTrie" : "0x7be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69",
-                    "stateRoot" : "0x2c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8",
+                    "receiptTrie" : "0x9808ae2d0fa27034b75c000c29d9dc5f77cfec91ccb66e65a4512dba0d33668e",
+                    "stateRoot" : "0x579df56673025a6bb1eb4b0197a8fc662b21d5a5c22c40e4838bf0a3505af0d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a07be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fb5e48203e880a09fc97ceb9e2cb4358eccd483de6c6867e80717db82c803783f159166063e317188c39133aa03788502f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0579df56673025a6bb1eb4b0197a8fc662b21d5a5c22c40e4838bf0a3505af0d6a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a09808ae2d0fa27034b75c000c29d9dc5f77cfec91ccb66e65a4512dba0d33668eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fb8788203e880a071967fd3cdb4a7aa6e6777f7f3f07f72d820d14f7587732bd1898beca6a15839886c0a5e0d73a4dea3f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81493cad025712a0e273363ca497731e9efc3b9faeee4d8f0b066491f61b7518",
-        "network" : "Frontier",
+        "lastblockhash" : "0x596b94779b5fdba3e261301ee5b4a8a2adaa340942f1f75909da4905ef05192f",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513b5e4",
+                "balance" : "0x456391824513b878",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742c37c",
+                "balance" : "0x0de0b6b3a742c0e8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CallRipemd160_5_d0g0v0_Homestead" : {
+    "CallRipemd160_5_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/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fb5e4",
-                    "hash" : "0x78fdf8f6225ffe0613264e3be87b61fc2a5148132c6c3d6ca02a158304afc391",
-                    "mixHash" : "0x0f286d3c0c4f9c69f0b395cc2f3b0918255c5f47a0c888bddef82ca19e29abdf",
-                    "nonce" : "0x5626262b1b2f044c",
+                    "gasUsed" : "0x1f56d0",
+                    "hash" : "0x124834516471adb540e6e6eeed3776ba991ce01a8c9f279259bbb20560147688",
+                    "mixHash" : "0x67562fa21f441802f1583630dfa5e70701b7f8362fe373731500f1a1857f5757",
+                    "nonce" : "0xbe6f53445a5e407a",
                     "number" : "0x01",
                     "parentHash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
-                    "receiptTrie" : "0x7be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69",
-                    "stateRoot" : "0x2c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8",
+                    "receiptTrie" : "0x58cdffe0effa7979867247d1196ca952f73c4175a749871dc64bd7408ad38c7b",
+                    "stateRoot" : "0x69856da2e7dbc88135ba117f9c94ceafb1521807ca6ddd58f2f299edc23d3113",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a07be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fb5e48203e880a00f286d3c0c4f9c69f0b395cc2f3b0918255c5f47a0c888bddef82ca19e29abdf885626262b1b2f044cf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069856da2e7dbc88135ba117f9c94ceafb1521807ca6ddd58f2f299edc23d3113a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a058cdffe0effa7979867247d1196ca952f73c4175a749871dc64bd7408ad38c7bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a067562fa21f441802f1583630dfa5e70701b7f8362fe373731500f1a1857f575788be6f53445a5e407af865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78fdf8f6225ffe0613264e3be87b61fc2a5148132c6c3d6ca02a158304afc391",
-        "network" : "Homestead",
+        "lastblockhash" : "0x124834516471adb540e6e6eeed3776ba991ce01a8c9f279259bbb20560147688",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513b5e4",
+                "balance" : "0x45639182451356d0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742c37c",
+                "balance" : "0x0de0b6b3a7432290",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CallRipemd160_5_d0g0v0_Metropolis" : {
+    "CallRipemd160_5_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/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f56d0",
-                    "hash" : "0xe583ee34a82c4ed2e113d8860c41feaac7048897ed6a74a3fb3934396812ad4a",
-                    "mixHash" : "0xd738fb601b524cd3ce9d59ab44b103bf3aac3a1264dfbd374e16cb87595341bf",
-                    "nonce" : "0xb5f940ed30559a32",
+                    "gasUsed" : "0x1fb5e4",
+                    "hash" : "0xa054d7a2086d3dbb1fd8abf3489e8c5303e00d85b596ade3c2fa83fc0b390423",
+                    "mixHash" : "0x2227aaedb8f808289dbc1cfb30896031b8fdde728fd7c54ca5255e616c0cfbcf",
+                    "nonce" : "0xe90b903ba8d86af3",
                     "number" : "0x01",
                     "parentHash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
-                    "receiptTrie" : "0xcf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22d",
-                    "stateRoot" : "0x3599a9c4eaf70dc51516255d4cda3d6848ad8622221ac18e5c9d29b3c644e9e8",
+                    "receiptTrie" : "0x7be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69",
+                    "stateRoot" : "0x2c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03599a9c4eaf70dc51516255d4cda3d6848ad8622221ac18e5c9d29b3c644e9e8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cf8e81ab80b6e4e2bbe3f36b604253cf40e69690bb992f3999c83925ef2bc22db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f56d08203e880a0d738fb601b524cd3ce9d59ab44b103bf3aac3a1264dfbd374e16cb87595341bf88b5f940ed30559a32f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a07be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fb5e48203e880a02227aaedb8f808289dbc1cfb30896031b8fdde728fd7c54ca5255e616c0cfbcf88e90b903ba8d86af3f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe583ee34a82c4ed2e113d8860c41feaac7048897ed6a74a3fb3934396812ad4a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa054d7a2086d3dbb1fd8abf3489e8c5303e00d85b596ade3c2fa83fc0b390423",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824513b5e4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a742c37c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRipemd160_5_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1fb5e4",
+                    "hash" : "0x364697217f9ac8c71ad399ab953c2b9c73e61bd3db1e679e990f856a5b91f0f1",
+                    "mixHash" : "0x8182f37267709f6bb654b3bf9263878e35cc80a7d99bd02c7c62e5cbf3c880da",
+                    "nonce" : "0x4d20d42eb2b9f76a",
+                    "number" : "0x01",
+                    "parentHash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
+                    "receiptTrie" : "0x7be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69",
+                    "stateRoot" : "0x2c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0cba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c895d241b59330fffc232064b49984aba806fc84b748e973351fa982f121ab8a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a07be6ec435a9b918e0a386228115633203492d583db46182aa4497666e126be69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fb5e48203e880a08182f37267709f6bb654b3bf9263878e35cc80a7d99bd02c7c62e5cbf3c880da884d20d42eb2b9f76af865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcba9fb1f0021f1f142dcc245537f17534d4d997ced26b5becf99664d6ff1ff1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597ed",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3facd83796816f95f86e9355d2d4854d78b381bf33640cc3412df19072597eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x364697217f9ac8c71ad399ab953c2b9c73e61bd3db1e679e990f856a5b91f0f1",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451356d0",
+                "balance" : "0x456391824513b5e4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7432290",
+                "balance" : "0x0de0b6b3a742c37c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_0_d0g0v0.json
index 7eea8526b..86d39bfd4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_0_d0g0v0_EIP150" : {
+    "CallSha256_0_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/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0104fe",
-                    "hash" : "0x673c57b37b5e2c0ca0f9a05aabfb346c871f86ece6cbcde47e31f1567ee9e093",
-                    "mixHash" : "0x90791ad3d6d07b829d753438ffb8922866fac3dc6d53145aa9e3bcf032e00c71",
-                    "nonce" : "0x55b7ea8e0f2fef8a",
+                    "gasUsed" : "0xa356",
+                    "hash" : "0x38e93a119a08133d3fa745c3abba21f304435788abacf4103aecb8049d30e8bc",
+                    "mixHash" : "0x1d3233486d381f6dfd4fb5493f05483cbab8aa655136a5d58b3bda9573fb1b7b",
+                    "nonce" : "0x4dd1ae78f8641889",
                     "number" : "0x01",
                     "parentHash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
-                    "receiptTrie" : "0xb8b742a89037a28b9c4c6b60c865bc0630a5ab50c062bf2ab914c2100c33455b",
-                    "stateRoot" : "0xcfca9a3a065a8a354fe793130530806904132fdde92dbcb52c64af83da595e85",
+                    "receiptTrie" : "0x2bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddac",
+                    "stateRoot" : "0x0470860eda99d2cab30ba580938c0dc6577cdd6cfbceb4713e08c84a71b83ea5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfca9a3a065a8a354fe793130530806904132fdde92dbcb52c64af83da595e85a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b8b742a89037a28b9c4c6b60c865bc0630a5ab50c062bf2ab914c2100c33455bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830104fe8203e880a090791ad3d6d07b829d753438ffb8922866fac3dc6d53145aa9e3bcf032e00c718855b7ea8e0f2fef8af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00470860eda99d2cab30ba580938c0dc6577cdd6cfbceb4713e08c84a71b83ea5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddacb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a01d3233486d381f6dfd4fb5493f05483cbab8aa655136a5d58b3bda9573fb1b7b884dd1ae78f8641889f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x673c57b37b5e2c0ca0f9a05aabfb346c871f86ece6cbcde47e31f1567ee9e093",
-        "network" : "EIP150",
+        "lastblockhash" : "0x38e93a119a08133d3fa745c3abba21f304435788abacf4103aecb8049d30e8bc",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504fe",
+                "balance" : "0x4563918244f4a356",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7617462",
+                "balance" : "0x0de0b6b3a761d60a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallSha256_0_d0g0v0_EIP158" : {
+    "CallSha256_0_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/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa356",
-                    "hash" : "0x2dce980ddd6c64368615052f8636c19fa3a06e6e780362520cf6234a923fb1f9",
-                    "mixHash" : "0x749a0278466c568d63ae17181897a45bd479d4c0fb69abca79f0a2b8fbaed1f1",
-                    "nonce" : "0x70d128bdf4f0dbc1",
+                    "hash" : "0x51aba60a78cbdd7d1008e241043e1816eb4b1d9c859707cafae665dc6ae55eec",
+                    "mixHash" : "0xc899d51a5330566d1c157e6f2b64ec551e01be739d592e6dbe2ea7526ab7ecf6",
+                    "nonce" : "0x952c007c04cad8f4",
                     "number" : "0x01",
                     "parentHash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
-                    "receiptTrie" : "0xd9ee08e0f1f0a4231c9597fe7371ef1728864a2842ffda4aab37129d95914fea",
-                    "stateRoot" : "0xa0ed7c1868724987cbf3199c2df1a464ecc1de4152c14d1c21e52f1332d4039b",
+                    "receiptTrie" : "0x2bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddac",
+                    "stateRoot" : "0x0470860eda99d2cab30ba580938c0dc6577cdd6cfbceb4713e08c84a71b83ea5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0ed7c1868724987cbf3199c2df1a464ecc1de4152c14d1c21e52f1332d4039ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d9ee08e0f1f0a4231c9597fe7371ef1728864a2842ffda4aab37129d95914feab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a0749a0278466c568d63ae17181897a45bd479d4c0fb69abca79f0a2b8fbaed1f18870d128bdf4f0dbc1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00470860eda99d2cab30ba580938c0dc6577cdd6cfbceb4713e08c84a71b83ea5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddacb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a0c899d51a5330566d1c157e6f2b64ec551e01be739d592e6dbe2ea7526ab7ecf688952c007c04cad8f4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2dce980ddd6c64368615052f8636c19fa3a06e6e780362520cf6234a923fb1f9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x51aba60a78cbdd7d1008e241043e1816eb4b1d9c859707cafae665dc6ae55eec",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x600160005260206000602060006000600260fff1600051600055",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallSha256_0_d0g0v0_Frontier" : {
+    "CallSha256_0_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/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01026a",
-                    "hash" : "0xbb3e8519faa5232d11020f348b49fb5cd3c4a97ef13e7d4ae1ba5d8b278c4867",
-                    "mixHash" : "0x5ab1c955e944a18ef7f90b860fbb59bd0e0549e74d6a4fb990ead35acdcd394c",
-                    "nonce" : "0xb0e2856a5383f255",
+                    "gasUsed" : "0x0104fe",
+                    "hash" : "0x622ef5a22d9cbed6d283cf591b08c78e3e470f39e19da705f83a1e139df1530c",
+                    "mixHash" : "0xcc98bdde8ea79170ceb77ae689e01a7ce8670822287f68eb9673ac6a90aa8fca",
+                    "nonce" : "0x26bc91246897ba90",
                     "number" : "0x01",
                     "parentHash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
-                    "receiptTrie" : "0x8acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042",
-                    "stateRoot" : "0x0ab2dc8585c9395031e0bb0278d3ba30d3b6f2b434d74bd9494522fd564304a7",
+                    "receiptTrie" : "0xb8b742a89037a28b9c4c6b60c865bc0630a5ab50c062bf2ab914c2100c33455b",
+                    "stateRoot" : "0xcfca9a3a065a8a354fe793130530806904132fdde92dbcb52c64af83da595e85",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ab2dc8585c9395031e0bb0278d3ba30d3b6f2b434d74bd9494522fd564304a7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301026a8203e880a05ab1c955e944a18ef7f90b860fbb59bd0e0549e74d6a4fb990ead35acdcd394c88b0e2856a5383f255f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfca9a3a065a8a354fe793130530806904132fdde92dbcb52c64af83da595e85a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b8b742a89037a28b9c4c6b60c865bc0630a5ab50c062bf2ab914c2100c33455bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830104fe8203e880a0cc98bdde8ea79170ceb77ae689e01a7ce8670822287f68eb9673ac6a90aa8fca8826bc91246897ba90f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb3e8519faa5232d11020f348b49fb5cd3c4a97ef13e7d4ae1ba5d8b278c4867",
-        "network" : "Frontier",
+        "lastblockhash" : "0x622ef5a22d9cbed6d283cf591b08c78e3e470f39e19da705f83a1e139df1530c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5026a",
+                "balance" : "0x4563918244f504fe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76176f6",
+                "balance" : "0x0de0b6b3a7617462",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallSha256_0_d0g0v0_Homestead" : {
+    "CallSha256_0_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/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xa356",
+                    "hash" : "0x24c2e75416566e1ec6f8afb57a9646063fab76cc66033af8254eda26132c725b",
+                    "mixHash" : "0x52c3bf646922883f27e7ecb0b116c2b4a3bf2c9275cf297ca4595f9b99042333",
+                    "nonce" : "0x21eecaaeb7339f1b",
+                    "number" : "0x01",
+                    "parentHash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
+                    "receiptTrie" : "0xd9ee08e0f1f0a4231c9597fe7371ef1728864a2842ffda4aab37129d95914fea",
+                    "stateRoot" : "0xa0ed7c1868724987cbf3199c2df1a464ecc1de4152c14d1c21e52f1332d4039b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0ed7c1868724987cbf3199c2df1a464ecc1de4152c14d1c21e52f1332d4039ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0d9ee08e0f1f0a4231c9597fe7371ef1728864a2842ffda4aab37129d95914feab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a052c3bf646922883f27e7ecb0b116c2b4a3bf2c9275cf297ca4595f9b990423338821eecaaeb7339f1bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x24c2e75416566e1ec6f8afb57a9646063fab76cc66033af8254eda26132c725b",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x600160005260206000602060006000600260fff1600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a356",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d60a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x600160005260206000602060006000600260fff1600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_0_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01026a",
-                    "hash" : "0x11ec68d6104f8efaec216582b621dfd0214347e0ec9fe26a444687a09fa9bdeb",
-                    "mixHash" : "0xdc797ff921ada22105ca7ce65725562ec801ec1079f4660291c3f61f496dbcc1",
-                    "nonce" : "0xda634908419b0e6a",
+                    "hash" : "0x194c6058eda9004c0bb6694ea42a7367b80d0a7ddd0aaca89bcc8e432bb9dfc3",
+                    "mixHash" : "0xf40f1ad5c346fd36ea8d0c59b8f9a4f113cd1ca242e1915457b7c599877b0443",
+                    "nonce" : "0x7a41905e263bad0d",
                     "number" : "0x01",
                     "parentHash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
                     "receiptTrie" : "0x8acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ab2dc8585c9395031e0bb0278d3ba30d3b6f2b434d74bd9494522fd564304a7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301026a8203e880a0dc797ff921ada22105ca7ce65725562ec801ec1079f4660291c3f61f496dbcc188da634908419b0e6af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ab2dc8585c9395031e0bb0278d3ba30d3b6f2b434d74bd9494522fd564304a7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301026a8203e880a0f40f1ad5c346fd36ea8d0c59b8f9a4f113cd1ca242e1915457b7c599877b0443887a41905e263bad0df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11ec68d6104f8efaec216582b621dfd0214347e0ec9fe26a444687a09fa9bdeb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x194c6058eda9004c0bb6694ea42a7367b80d0a7ddd0aaca89bcc8e432bb9dfc3",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallSha256_0_d0g0v0_Metropolis" : {
+    "CallSha256_0_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/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa356",
-                    "hash" : "0x2abd4ae3f4433e4ca03f38c6d5b4abc8078f6c215f583ace6b41c822f1951542",
-                    "mixHash" : "0xbec30bd360ee904cf1e148bf5eafb75e2bebfc35850f56f95e381cfc86c935be",
-                    "nonce" : "0x709abcfb9b7f3c9b",
+                    "gasUsed" : "0x01026a",
+                    "hash" : "0x27a8410f69ad1c850d7791bcc3b50491d13778c85fe6a113beab3d441dbcaf1a",
+                    "mixHash" : "0x2fa0e93cfa24fad7b2d78ab6579835f4f94fe9671b76d259e6bb1b15f221c230",
+                    "nonce" : "0x06bc050481d64cfa",
                     "number" : "0x01",
                     "parentHash" : "0x4da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1",
-                    "receiptTrie" : "0x2bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddac",
-                    "stateRoot" : "0x0470860eda99d2cab30ba580938c0dc6577cdd6cfbceb4713e08c84a71b83ea5",
+                    "receiptTrie" : "0x8acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042",
+                    "stateRoot" : "0x0ab2dc8585c9395031e0bb0278d3ba30d3b6f2b434d74bd9494522fd564304a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00470860eda99d2cab30ba580938c0dc6577cdd6cfbceb4713e08c84a71b83ea5a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba02bda761c09e0923d72c278a393e30b6e50cd1e9d366aeffdeab64d254479ddacb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a3568203e880a0bec30bd360ee904cf1e148bf5eafb75e2bebfc35850f56f95e381cfc86c935be88709abcfb9b7f3c9bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a04da04e99b7b73f5124486f847db451180b91cf971b6175df01faea91a20e1bf1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ab2dc8585c9395031e0bb0278d3ba30d3b6f2b434d74bd9494522fd564304a7a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08acb949099f914086bc6a4c2e056a3165088150b76c984b040b93da182661042b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301026a8203e880a02fa0e93cfa24fad7b2d78ab6579835f4f94fe9671b76d259e6bb1b15f221c2308806bc050481d64cfaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05784f682ce8a7ed3f0975f108fabf7813ff773c6f2bff44df049729a276305e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2abd4ae3f4433e4ca03f38c6d5b4abc8078f6c215f583ace6b41c822f1951542",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x27a8410f69ad1c850d7791bcc3b50491d13778c85fe6a113beab3d441dbcaf1a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a356",
+                "balance" : "0x4563918244f5026a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d60a",
+                "balance" : "0x0de0b6b3a76176f6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_d0g0v0.json
index 1225f72e9..8726692e0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_1_d0g0v0_EIP150" : {
+    "CallSha256_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01530c",
-                    "hash" : "0x984912464fd7b3e881ed85f6a38611f3e2768a2ddadfc7031a0911a095a0b766",
-                    "mixHash" : "0x22705dbc0d286545915e378b047202e3d7942065b51762eec60f4245dd50f424",
-                    "nonce" : "0x5cb49a4e101c7b2e",
+                    "gasUsed" : "0xf164",
+                    "hash" : "0x26985c583c543899a6f98456b61aee5ab5969a19e3d5bd6c3e6c07b22cd171b4",
+                    "mixHash" : "0xaeda4e31ffdb6efd06694a4472e9e41433838f45516bb5eb668e41a185a23720",
+                    "nonce" : "0x953b69d4699e5aba",
                     "number" : "0x01",
                     "parentHash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
-                    "receiptTrie" : "0x8b2475c103b417da387bf69e2c01a0c69d6d2a78a537604ecd9098c73a94475d",
-                    "stateRoot" : "0xd7212e35b46d706fba84d11b18485e3572400bcbef195c60de968ac47e385320",
+                    "receiptTrie" : "0x8af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fa",
+                    "stateRoot" : "0xeb49ad27da2199a6febb3b0a496d813decad70020a09376f85df445e5ebc4850",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7212e35b46d706fba84d11b18485e3572400bcbef195c60de968ac47e385320a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08b2475c103b417da387bf69e2c01a0c69d6d2a78a537604ecd9098c73a94475db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301530c8203e880a022705dbc0d286545915e378b047202e3d7942065b51762eec60f4245dd50f424885cb49a4e101c7b2ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb49ad27da2199a6febb3b0a496d813decad70020a09376f85df445e5ebc4850a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a0aeda4e31ffdb6efd06694a4472e9e41433838f45516bb5eb668e41a185a2372088953b69d4699e5abaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x984912464fd7b3e881ed85f6a38611f3e2768a2ddadfc7031a0911a095a0b766",
-        "network" : "EIP150",
+        "lastblockhash" : "0x26985c583c543899a6f98456b61aee5ab5969a19e3d5bd6c3e6c07b22cd171b4",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5530c",
+                "balance" : "0x4563918244f4f164",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612654",
+                "balance" : "0x0de0b6b3a76187fc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_1_d0g0v0_EIP158" : {
+    "CallSha256_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf164",
-                    "hash" : "0x193a412841b8c87d96e5a0722bda6a4d82664fc2ebd838324ac8557c7f79fe3d",
-                    "mixHash" : "0x6b233f69c1e598c9bdf7d16c3d80ad50dfa51cfd7e5bacd0a5d139726462862d",
-                    "nonce" : "0xc46bbf9cba0bcd3e",
+                    "hash" : "0xc23e3b193af505cbc5ee08d6bbecd6189d98b5bb41e130d1537d3a17e25ffefb",
+                    "mixHash" : "0x5e5e7406d6e300bcc9192eee1b6cfd09198d0b76b3d0cccd05346d3b5238bd3d",
+                    "nonce" : "0x28cc874d25d76852",
                     "number" : "0x01",
                     "parentHash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
-                    "receiptTrie" : "0x1e322c7d2c3f3ecc3295c2c591375c7713ff745d78286d1923ed56cfeed9cb88",
-                    "stateRoot" : "0x938b51a3327da1750a3074d65ffdcd3ee69627f498358a5b4f0f229ed940c4c4",
+                    "receiptTrie" : "0x8af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fa",
+                    "stateRoot" : "0xeb49ad27da2199a6febb3b0a496d813decad70020a09376f85df445e5ebc4850",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938b51a3327da1750a3074d65ffdcd3ee69627f498358a5b4f0f229ed940c4c4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01e322c7d2c3f3ecc3295c2c591375c7713ff745d78286d1923ed56cfeed9cb88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a06b233f69c1e598c9bdf7d16c3d80ad50dfa51cfd7e5bacd0a5d139726462862d88c46bbf9cba0bcd3ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb49ad27da2199a6febb3b0a496d813decad70020a09376f85df445e5ebc4850a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a05e5e7406d6e300bcc9192eee1b6cfd09198d0b76b3d0cccd05346d3b5238bd3d8828cc874d25d76852f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x193a412841b8c87d96e5a0722bda6a4d82664fc2ebd838324ac8557c7f79fe3d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc23e3b193af505cbc5ee08d6bbecd6189d98b5bb41e130d1537d3a17e25ffefb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x6020600060006000600060026101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_1_d0g0v0_Frontier" : {
+    "CallSha256_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015078",
-                    "hash" : "0x76f3462d01fe8878d6748add18f94a5db572ab91fbc33d24fd72e9b1a96236bc",
-                    "mixHash" : "0x871dec707850884fd6548831c7e607e43707e9542b0ceda879bd73630dff1b62",
-                    "nonce" : "0x789f5eb748def610",
+                    "gasUsed" : "0x01530c",
+                    "hash" : "0xc03333d2fc8e502027897654f857e0797a06e62f4eee404283d0c9fa85327e63",
+                    "mixHash" : "0x0f292f40fe0735d333ff34efa37739d5ca04b309acb8e7856c4458dbf88219c5",
+                    "nonce" : "0xd3de157e4043c3bf",
                     "number" : "0x01",
                     "parentHash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
-                    "receiptTrie" : "0x7d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46",
-                    "stateRoot" : "0x1d34c2459f1b988533cb8a5a959180298883506e7a33b86cbc765c67a0a68f49",
+                    "receiptTrie" : "0x8b2475c103b417da387bf69e2c01a0c69d6d2a78a537604ecd9098c73a94475d",
+                    "stateRoot" : "0xd7212e35b46d706fba84d11b18485e3572400bcbef195c60de968ac47e385320",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d34c2459f1b988533cb8a5a959180298883506e7a33b86cbc765c67a0a68f49a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150788203e880a0871dec707850884fd6548831c7e607e43707e9542b0ceda879bd73630dff1b6288789f5eb748def610f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7212e35b46d706fba84d11b18485e3572400bcbef195c60de968ac47e385320a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08b2475c103b417da387bf69e2c01a0c69d6d2a78a537604ecd9098c73a94475db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301530c8203e880a00f292f40fe0735d333ff34efa37739d5ca04b309acb8e7856c4458dbf88219c588d3de157e4043c3bff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76f3462d01fe8878d6748add18f94a5db572ab91fbc33d24fd72e9b1a96236bc",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc03333d2fc8e502027897654f857e0797a06e62f4eee404283d0c9fa85327e63",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55078",
+                "balance" : "0x4563918244f5530c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128e8",
+                "balance" : "0x0de0b6b3a7612654",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_1_d0g0v0_Homestead" : {
+    "CallSha256_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf164",
+                    "hash" : "0x4bc46a10037931ef140824129d7d5b2b0f5c38e6bfaf4f4934da467b9c3f0109",
+                    "mixHash" : "0x6284cea0329873c40709ac769337a9ed08903d54a86e60e60ddc3805022ffbcd",
+                    "nonce" : "0x874749c8afc9d027",
+                    "number" : "0x01",
+                    "parentHash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
+                    "receiptTrie" : "0x1e322c7d2c3f3ecc3295c2c591375c7713ff745d78286d1923ed56cfeed9cb88",
+                    "stateRoot" : "0x938b51a3327da1750a3074d65ffdcd3ee69627f498358a5b4f0f229ed940c4c4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0938b51a3327da1750a3074d65ffdcd3ee69627f498358a5b4f0f229ed940c4c4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01e322c7d2c3f3ecc3295c2c591375c7713ff745d78286d1923ed56cfeed9cb88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a06284cea0329873c40709ac769337a9ed08903d54a86e60e60ddc3805022ffbcd88874749c8afc9d027f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdef5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4bc46a10037931ef140824129d7d5b2b0f5c38e6bfaf4f4934da467b9c3f0109",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x6020600060006000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f164",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187fc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x6020600060006000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015078",
-                    "hash" : "0x0a8a50f95abf7c29dc5505d1f88e15e50dd4a92c29d70f94279580d77f12ac7b",
-                    "mixHash" : "0x2c115a4cad5022420e7a9092d11a407d143490257b6657381772ff2bcd49ea13",
-                    "nonce" : "0x36583b2b6e3f91a5",
+                    "hash" : "0x7150ed3458be91f0d4be8890673d722931881f1e29df8ec40bae378b20f27d00",
+                    "mixHash" : "0x696e85bcd53999c0955ca2227b8fd57adb4deb5f0643f44122f60d343dbe189d",
+                    "nonce" : "0x4f05cfff34406035",
                     "number" : "0x01",
                     "parentHash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
                     "receiptTrie" : "0x7d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d34c2459f1b988533cb8a5a959180298883506e7a33b86cbc765c67a0a68f49a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150788203e880a02c115a4cad5022420e7a9092d11a407d143490257b6657381772ff2bcd49ea138836583b2b6e3f91a5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d34c2459f1b988533cb8a5a959180298883506e7a33b86cbc765c67a0a68f49a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150788203e880a0696e85bcd53999c0955ca2227b8fd57adb4deb5f0643f44122f60d343dbe189d884f05cfff34406035f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a8a50f95abf7c29dc5505d1f88e15e50dd4a92c29d70f94279580d77f12ac7b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7150ed3458be91f0d4be8890673d722931881f1e29df8ec40bae378b20f27d00",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_1_d0g0v0_Metropolis" : {
+    "CallSha256_1_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/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf164",
-                    "hash" : "0x8cc12357f1ad41516bc6182fef45d28897de1303431ae490fff21e3d066e506c",
-                    "mixHash" : "0xf51889528f11abe9c5ba93ea758111addaa571085d0c8a42a393783ac443d8ed",
-                    "nonce" : "0x99cca8c8995eda91",
+                    "gasUsed" : "0x015078",
+                    "hash" : "0x283e241712a8a56ff5314725d0c352dfead758afa49c261946523563c8d50e1e",
+                    "mixHash" : "0xaf047d9a69d252ca156094f438924c2629c497543f06c76711a9f90c25d24a85",
+                    "nonce" : "0xd518ae2c28af9bf8",
                     "number" : "0x01",
                     "parentHash" : "0xf77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1f",
-                    "receiptTrie" : "0x8af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fa",
-                    "stateRoot" : "0xeb49ad27da2199a6febb3b0a496d813decad70020a09376f85df445e5ebc4850",
+                    "receiptTrie" : "0x7d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46",
+                    "stateRoot" : "0x1d34c2459f1b988533cb8a5a959180298883506e7a33b86cbc765c67a0a68f49",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb49ad27da2199a6febb3b0a496d813decad70020a09376f85df445e5ebc4850a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08af092258e5daa56fc675db0f66bbda77f0c6490c1d129dedf4ef919a6ac23fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1648203e880a0f51889528f11abe9c5ba93ea758111addaa571085d0c8a42a393783ac443d8ed8899cca8c8995eda91f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0f77a6875840349e3f3243f0bd116a4483802363aed28d9f62ecb98b4c8d93d1fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d34c2459f1b988533cb8a5a959180298883506e7a33b86cbc765c67a0a68f49a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba07d8aeb69f21adfdc8828e38a0d6f30612165f1b63bcaa97d10f818953b62ed46b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150788203e880a0af047d9a69d252ca156094f438924c2629c497543f06c76711a9f90c25d24a8588d518ae2c28af9bf8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0def5a6b78e44d2910ab6f5c29b86d76aa3157ab50c065d3dd547a293313be5d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8cc12357f1ad41516bc6182fef45d28897de1303431ae490fff21e3d066e506c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x283e241712a8a56ff5314725d0c352dfead758afa49c261946523563c8d50e1e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f164",
+                "balance" : "0x4563918244f55078",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187fc",
+                "balance" : "0x0de0b6b3a76128e8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0.json
index 2a5f52a3f..96368948d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_1_nonzeroValue_d0g0v0_EIP150" : {
+    "CallSha256_1_nonzeroValue_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/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x016d38",
-                    "hash" : "0x27684a0cc82a2282c30fe7d00cff156b3e046b3099a61778fe6fd64847e11c3f",
-                    "mixHash" : "0xc0982bcca66552f11d16ec9662fbaf2042d731d65927fa4db3e567b1860a6395",
-                    "nonce" : "0x3d0427e1c6535579",
+                    "hash" : "0x156fb25dd58ada86daed0fd63e02b1b13910b04ca166c048a7cfe51ad6e26c6a",
+                    "mixHash" : "0x0adbccda5735b30bb6cf0ce3d62531b3bc13b4b23f5ec95b0b84d6a8bd0f34ee",
+                    "nonce" : "0xf94dadb58f67ff32",
                     "number" : "0x01",
                     "parentHash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
-                    "receiptTrie" : "0x51783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329eb",
-                    "stateRoot" : "0x8915e4becf427ba0eee64b4c43b1a3428987bc973fab2830a6c7e2524a794b1e",
+                    "receiptTrie" : "0x98a673f82ec478937a76cee65d0c6033737aa2d8e8dab6007c8891b8b5a1a65d",
+                    "stateRoot" : "0xfe525f7a5575cd67e77e04dc2c45a1c4a378d83aed96156a97b091be3bab5139",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08915e4becf427ba0eee64b4c43b1a3428987bc973fab2830a6c7e2524a794b1ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba051783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a0c0982bcca66552f11d16ec9662fbaf2042d731d65927fa4db3e567b1860a6395883d0427e1c6535579f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe525f7a5575cd67e77e04dc2c45a1c4a378d83aed96156a97b091be3bab5139a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba098a673f82ec478937a76cee65d0c6033737aa2d8e8dab6007c8891b8b5a1a65db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a00adbccda5735b30bb6cf0ce3d62531b3bc13b4b23f5ec95b0b84d6a8bd0f34ee88f94dadb58f67ff32f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27684a0cc82a2282c30fe7d00cff156b3e046b3099a61778fe6fd64847e11c3f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x156fb25dd58ada86daed0fd63e02b1b13910b04ca166c048a7cfe51ad6e26c6a",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x13",
@@ -72,6 +72,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed488d",
                 "code" : "0x60206000600060006013600262030d40f1600255600051600055",
@@ -113,10 +120,10 @@
             }
         }
     },
-    "CallSha256_1_nonzeroValue_d0g0v0_EIP158" : {
+    "CallSha256_1_nonzeroValue_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/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,9 +135,130 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x016d38",
-                    "hash" : "0x989f7890c2aef1f14a6a346ad1f8e9b48fcee46040e62b0f56f7e24ecc564fd5",
-                    "mixHash" : "0x6831ddb2ab8b9419a1ca5179e7943a93142261ab057a2e072d4cd2253be8a7c7",
-                    "nonce" : "0xdf9163291c1a5861",
+                    "hash" : "0xa5b5d819be2ee83f536fc182942699d27e0a5cfc9da38a39797b9a98cc51be61",
+                    "mixHash" : "0xd93068412c7d9500f7b1f2ed307d5056bbe99e3cafb6c173565afbc9402879b5",
+                    "nonce" : "0xe282b3f5215ec3bb",
+                    "number" : "0x01",
+                    "parentHash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
+                    "receiptTrie" : "0x98a673f82ec478937a76cee65d0c6033737aa2d8e8dab6007c8891b8b5a1a65d",
+                    "stateRoot" : "0xfe525f7a5575cd67e77e04dc2c45a1c4a378d83aed96156a97b091be3bab5139",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe525f7a5575cd67e77e04dc2c45a1c4a378d83aed96156a97b091be3bab5139a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba098a673f82ec478937a76cee65d0c6033737aa2d8e8dab6007c8891b8b5a1a65db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a0d93068412c7d9500f7b1f2ed307d5056bbe99e3cafb6c173565afbc9402879b588e282b3f5215ec3bbf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa5b5d819be2ee83f536fc182942699d27e0a5cfc9da38a39797b9a98cc51be61",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bed488d",
+                "code" : "0x60206000600060006013600262030d40f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56d38",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7610c28",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0bebc200",
+                "code" : "0x60206000600060006013600262030d40f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_1_nonzeroValue_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x016d38",
+                    "hash" : "0xa38e0319acd1249002fb5a2382cf491c3f649ca54bef0fd141d233f78118497d",
+                    "mixHash" : "0xed3b94d0b2e2ad057de0cae5c385c94f9f80126304b3d10a70b08a2175c36ec8",
+                    "nonce" : "0x95e4fe000c3a01b9",
                     "number" : "0x01",
                     "parentHash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
                     "receiptTrie" : "0x51783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329eb",
@@ -139,7 +267,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08915e4becf427ba0eee64b4c43b1a3428987bc973fab2830a6c7e2524a794b1ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba051783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a06831ddb2ab8b9419a1ca5179e7943a93142261ab057a2e072d4cd2253be8a7c788df9163291c1a5861f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08915e4becf427ba0eee64b4c43b1a3428987bc973fab2830a6c7e2524a794b1ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba051783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a0ed3b94d0b2e2ad057de0cae5c385c94f9f80126304b3d10a70b08a2175c36ec88895e4fe000c3a01b9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x989f7890c2aef1f14a6a346ad1f8e9b48fcee46040e62b0f56f7e24ecc564fd5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa38e0319acd1249002fb5a2382cf491c3f649ca54bef0fd141d233f78118497d",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x13",
@@ -227,10 +355,10 @@
             }
         }
     },
-    "CallSha256_1_nonzeroValue_d0g0v0_Frontier" : {
+    "CallSha256_1_nonzeroValue_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/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +369,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x016aa4",
-                    "hash" : "0x6af5b868391c619bba028cd99afcf705e9885131f4f983925a60108bf1565ecb",
-                    "mixHash" : "0x64fe5bcaa15e3afede3b06654ed515070ed070f7fbcf1e6daadfb7943a8ea78c",
-                    "nonce" : "0xdb8a7b334660923a",
+                    "gasUsed" : "0x016d38",
+                    "hash" : "0x27fc543d37f6738f81e3912db20aa0484cda96c58007685a5bdad257348556fa",
+                    "mixHash" : "0x91c5bfb8cb02cdbe7eef68032a3d10b9f2ef78272cc2737f36c867b2d695ab44",
+                    "nonce" : "0x1bd61ebcc74f2dbf",
                     "number" : "0x01",
                     "parentHash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
-                    "receiptTrie" : "0x8f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69",
-                    "stateRoot" : "0xcc01651ec4f7a7c464f90012b582f1c8eb96362d69019a57f12b66d9479b7003",
+                    "receiptTrie" : "0x51783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329eb",
+                    "stateRoot" : "0x8915e4becf427ba0eee64b4c43b1a3428987bc973fab2830a6c7e2524a794b1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc01651ec4f7a7c464f90012b582f1c8eb96362d69019a57f12b66d9479b7003a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016aa48203e880a064fe5bcaa15e3afede3b06654ed515070ed070f7fbcf1e6daadfb7943a8ea78c88db8a7b334660923af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08915e4becf427ba0eee64b4c43b1a3428987bc973fab2830a6c7e2524a794b1ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba051783cb6d1456031da6839c9e871b3a9cf4881cee351cd6fdf174e3c6e9329ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a091c5bfb8cb02cdbe7eef68032a3d10b9f2ef78272cc2737f36c867b2d695ab44881bd61ebcc74f2dbff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6af5b868391c619bba028cd99afcf705e9885131f4f983925a60108bf1565ecb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x27fc543d37f6738f81e3912db20aa0484cda96c58007685a5bdad257348556fa",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x13",
@@ -310,14 +438,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56aa4",
+                "balance" : "0x4563918244f56d38",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7610ebc",
+                "balance" : "0x0de0b6b3a7610c28",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -341,10 +469,10 @@
             }
         }
     },
-    "CallSha256_1_nonzeroValue_d0g0v0_Homestead" : {
+    "CallSha256_1_nonzeroValue_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/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,9 +484,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x016aa4",
-                    "hash" : "0xc5ff5fc47e160eed294122cc9ba9701f09b892ce90a458539170d8b571ffe935",
-                    "mixHash" : "0xcba8557563acd77925fad2d466612d2fe24fed0dc5f1474003db275bf4c91765",
-                    "nonce" : "0xc435934f3ee1dfa2",
+                    "hash" : "0x705c6f5b5da2d9f5ebdaf0107bcbdf7f4d21044108f21e99903853ae47a268e3",
+                    "mixHash" : "0x1ea67aea3dc79305dc1da82da777491eea45e632b2d9cd35c89054fe08508638",
+                    "nonce" : "0xc04f5879fe953a65",
                     "number" : "0x01",
                     "parentHash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
                     "receiptTrie" : "0x8f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69",
@@ -367,7 +495,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc01651ec4f7a7c464f90012b582f1c8eb96362d69019a57f12b66d9479b7003a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016aa48203e880a0cba8557563acd77925fad2d466612d2fe24fed0dc5f1474003db275bf4c9176588c435934f3ee1dfa2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc01651ec4f7a7c464f90012b582f1c8eb96362d69019a57f12b66d9479b7003a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016aa48203e880a01ea67aea3dc79305dc1da82da777491eea45e632b2d9cd35c89054fe0850863888c04f5879fe953a65f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +532,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5ff5fc47e160eed294122cc9ba9701f09b892ce90a458539170d8b571ffe935",
-        "network" : "Homestead",
+        "lastblockhash" : "0x705c6f5b5da2d9f5ebdaf0107bcbdf7f4d21044108f21e99903853ae47a268e3",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x13",
@@ -455,10 +583,10 @@
             }
         }
     },
-    "CallSha256_1_nonzeroValue_d0g0v0_Metropolis" : {
+    "CallSha256_1_nonzeroValue_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/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -469,19 +597,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x016d38",
-                    "hash" : "0x987ae81889e129614e92e862038a9cb5a14562e9af5c46bcb8e2e1388217e3b0",
-                    "mixHash" : "0x35ee6a8a8dbfef7fc1e98d3fa1384dffe822ff83040b42aabd927fe89bb17bbe",
-                    "nonce" : "0x0d3ea2e511598a08",
+                    "gasUsed" : "0x016aa4",
+                    "hash" : "0x0d65b6fd5ceb6a1be08670465b42963cf8b9285c8ae47bd0f00530fdecd8cbd9",
+                    "mixHash" : "0xf017874cb4d753aeec7457fb8378e3c1d4e91e3032f97a94e52ab1de0df33daf",
+                    "nonce" : "0x0202eeed8a81c347",
                     "number" : "0x01",
                     "parentHash" : "0xbae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bd",
-                    "receiptTrie" : "0x98a673f82ec478937a76cee65d0c6033737aa2d8e8dab6007c8891b8b5a1a65d",
-                    "stateRoot" : "0xfe525f7a5575cd67e77e04dc2c45a1c4a378d83aed96156a97b091be3bab5139",
+                    "receiptTrie" : "0x8f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69",
+                    "stateRoot" : "0xcc01651ec4f7a7c464f90012b582f1c8eb96362d69019a57f12b66d9479b7003",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe525f7a5575cd67e77e04dc2c45a1c4a378d83aed96156a97b091be3bab5139a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba098a673f82ec478937a76cee65d0c6033737aa2d8e8dab6007c8891b8b5a1a65db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016d388203e880a035ee6a8a8dbfef7fc1e98d3fa1384dffe822ff83040b42aabd927fe89bb17bbe880d3ea2e511598a08f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90264f901f9a0bae3c08e1ead44c1dd2db522970637334703cba773121c41441d7ee1a3ff69bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc01651ec4f7a7c464f90012b582f1c8eb96362d69019a57f12b66d9479b7003a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba08f06fc653e1125dcbb9cdfa324cb4415eede6d21fe0ab64b628325899c2c3e69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083016aa48203e880a0f017874cb4d753aeec7457fb8378e3c1d4e91e3032f97a94e52ab1de0df33daf880202eeed8a81c347f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,8 +646,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa817f48009c7ea7c12fb61ee221db5d4e33102582f8ed7fa2cbcc80173fcbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x987ae81889e129614e92e862038a9cb5a14562e9af5c46bcb8e2e1388217e3b0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0d65b6fd5ceb6a1be08670465b42963cf8b9285c8ae47bd0f00530fdecd8cbd9",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x13",
@@ -528,13 +656,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bed488d",
                 "code" : "0x60206000600060006013600262030d40f1600255600051600055",
@@ -545,14 +666,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56d38",
+                "balance" : "0x4563918244f56aa4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7610c28",
+                "balance" : "0x0de0b6b3a7610ebc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_2_d0g0v0.json
index d90512d32..913201396 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_2_d0g0v0_EIP150" : {
+    "CallSha256_2_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/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015330",
-                    "hash" : "0xbeb28c95b04d810b320863ddae0c32063291ef0ddcc60ae568792634a0446704",
-                    "mixHash" : "0xbce486698448808c20cd6fa4140be2f08ea27334b2e8485543b7241bced36f9f",
-                    "nonce" : "0x7dd0276735e7976a",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x79475998ec435e4068cb8e7b6e18901f489319d0c535167bf295cb1fa9d3e3b9",
+                    "mixHash" : "0x8640c81edaebbf0c78041039036168008149230a109a7dc741d260e5472baacd",
+                    "nonce" : "0x3078c6170b9e8684",
                     "number" : "0x01",
                     "parentHash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
-                    "receiptTrie" : "0x50236991d2dd4c7deff195cb4f73c4898fd2035db57adaf9c31951fe49e95cf5",
-                    "stateRoot" : "0x0a782670df69cd01a845dc4af786673c20d865e9be3a456744e207c5c946e72e",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x291de4e725ceeff2ae9e451fb83aac30c5ed2010ffe3fd97dabf13b7dd927131",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a782670df69cd01a845dc4af786673c20d865e9be3a456744e207c5c946e72ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba050236991d2dd4c7deff195cb4f73c4898fd2035db57adaf9c31951fe49e95cf5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a0bce486698448808c20cd6fa4140be2f08ea27334b2e8485543b7241bced36f9f887dd0276735e7976af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0291de4e725ceeff2ae9e451fb83aac30c5ed2010ffe3fd97dabf13b7dd927131a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a08640c81edaebbf0c78041039036168008149230a109a7dc741d260e5472baacd883078c6170b9e8684f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbeb28c95b04d810b320863ddae0c32063291ef0ddcc60ae568792634a0446704",
-        "network" : "EIP150",
+        "lastblockhash" : "0x79475998ec435e4068cb8e7b6e18901f489319d0c535167bf295cb1fa9d3e3b9",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55330",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612630",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_2_d0g0v0_EIP158" : {
+    "CallSha256_2_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/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x19df593dec699fc16c0a6e9f08f199b3b5319e128b3f5486357fdbb2755d4c48",
-                    "mixHash" : "0xcee91379ccc22fbd53f6e29ad5a3f52a96e991358984f6639366cbac98722c3e",
-                    "nonce" : "0x9b430bc55c9817ed",
+                    "hash" : "0x2be6080752a3393754ea1f8b68f55e75079ba448e8e8c1c5a868c7012181dd56",
+                    "mixHash" : "0x4be3ed86f8d1ab900823ee97cf57b7f2f41490750a7baf7dfdc108f3b0766203",
+                    "nonce" : "0x76f03a5c45f2c65f",
                     "number" : "0x01",
                     "parentHash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
-                    "receiptTrie" : "0x533da08648ee8175ca983b804c55f88a21900006903d16fb0605ed0644977f39",
-                    "stateRoot" : "0xcdc55874c54e4c84b4d2c126cadae4c5d71069e81e99b0246571005abebdaff8",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x291de4e725ceeff2ae9e451fb83aac30c5ed2010ffe3fd97dabf13b7dd927131",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc55874c54e4c84b4d2c126cadae4c5d71069e81e99b0246571005abebdaff8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0533da08648ee8175ca983b804c55f88a21900006903d16fb0605ed0644977f39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0cee91379ccc22fbd53f6e29ad5a3f52a96e991358984f6639366cbac98722c3e889b430bc55c9817edf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0291de4e725ceeff2ae9e451fb83aac30c5ed2010ffe3fd97dabf13b7dd927131a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a04be3ed86f8d1ab900823ee97cf57b7f2f41490750a7baf7dfdc108f3b07662038876f03a5c45f2c65ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x19df593dec699fc16c0a6e9f08f199b3b5319e128b3f5486357fdbb2755d4c48",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2be6080752a3393754ea1f8b68f55e75079ba448e8e8c1c5a868c7012181dd56",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6005526020600060256000600060026101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_2_d0g0v0_Frontier" : {
+    "CallSha256_2_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/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01509c",
-                    "hash" : "0x2963ce09546f72b39ca623fcc19ae82e39a07956733e86baf752a9846a4ede33",
-                    "mixHash" : "0x96b5373bd3641c26b5978ec5097c96e8a7c4e6e738d5a1d3328a6de458300e1a",
-                    "nonce" : "0xdd606af4e66324f2",
+                    "gasUsed" : "0x015330",
+                    "hash" : "0x63a28699ca952f9ab06a734e123fa2d6e26c1bce7074afdc2dbc3daee7967abb",
+                    "mixHash" : "0xc4356f23afca98ef5909b7ee8ffb4f93e0ff2fe790e550304f564264e2ffc401",
+                    "nonce" : "0xc48279b11e8f78d5",
                     "number" : "0x01",
                     "parentHash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
-                    "receiptTrie" : "0xc2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10f",
-                    "stateRoot" : "0x4490d3882cdccfa8b6099b9fb83b095b58baf0b480104b60177710e01e8f33d4",
+                    "receiptTrie" : "0x50236991d2dd4c7deff195cb4f73c4898fd2035db57adaf9c31951fe49e95cf5",
+                    "stateRoot" : "0x0a782670df69cd01a845dc4af786673c20d865e9be3a456744e207c5c946e72e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04490d3882cdccfa8b6099b9fb83b095b58baf0b480104b60177710e01e8f33d4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a096b5373bd3641c26b5978ec5097c96e8a7c4e6e738d5a1d3328a6de458300e1a88dd606af4e66324f2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a782670df69cd01a845dc4af786673c20d865e9be3a456744e207c5c946e72ea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba050236991d2dd4c7deff195cb4f73c4898fd2035db57adaf9c31951fe49e95cf5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a0c4356f23afca98ef5909b7ee8ffb4f93e0ff2fe790e550304f564264e2ffc40188c48279b11e8f78d5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2963ce09546f72b39ca623fcc19ae82e39a07956733e86baf752a9846a4ede33",
-        "network" : "Frontier",
+        "lastblockhash" : "0x63a28699ca952f9ab06a734e123fa2d6e26c1bce7074afdc2dbc3daee7967abb",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5509c",
+                "balance" : "0x4563918244f55330",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128c4",
+                "balance" : "0x0de0b6b3a7612630",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_2_d0g0v0_Homestead" : {
+    "CallSha256_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x54c948f32ec12cc0f93bfeca7774cfd61c31fcee9152918334676740db5fbd58",
+                    "mixHash" : "0x9c41669259ad5db225e574c3ef998c0b088dcac17e4f79a864f824c368f07989",
+                    "nonce" : "0xa1e0408133baf0ae",
+                    "number" : "0x01",
+                    "parentHash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
+                    "receiptTrie" : "0x533da08648ee8175ca983b804c55f88a21900006903d16fb0605ed0644977f39",
+                    "stateRoot" : "0xcdc55874c54e4c84b4d2c126cadae4c5d71069e81e99b0246571005abebdaff8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cdc55874c54e4c84b4d2c126cadae4c5d71069e81e99b0246571005abebdaff8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0533da08648ee8175ca983b804c55f88a21900006903d16fb0605ed0644977f39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a09c41669259ad5db225e574c3ef998c0b088dcac17e4f79a864f824c368f0798988a1e0408133baf0aef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x54c948f32ec12cc0f93bfeca7774cfd61c31fcee9152918334676740db5fbd58",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6005526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6005526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_2_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/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01509c",
-                    "hash" : "0x17a7df92707685abb581edf44a5831cf3dbc3acd18258d37e520f8fcd8ffe643",
-                    "mixHash" : "0x93b28c772fc66229cb139c7da7a225f6d147bad60fe6e0a7f3fa599fc598e997",
-                    "nonce" : "0x1c884f2b3310f226",
+                    "hash" : "0x3d2e5fb0063a6b77aadea73596ab9db65e8f55ffaa61a2878d43886dcc640820",
+                    "mixHash" : "0x043b6f0e0831bf868c67f54a9b76732d0683736acdbd7bd6d5389a76214aeba7",
+                    "nonce" : "0x54d20d53aea2bdac",
                     "number" : "0x01",
                     "parentHash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
                     "receiptTrie" : "0xc2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10f",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04490d3882cdccfa8b6099b9fb83b095b58baf0b480104b60177710e01e8f33d4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a093b28c772fc66229cb139c7da7a225f6d147bad60fe6e0a7f3fa599fc598e997881c884f2b3310f226f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04490d3882cdccfa8b6099b9fb83b095b58baf0b480104b60177710e01e8f33d4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0043b6f0e0831bf868c67f54a9b76732d0683736acdbd7bd6d5389a76214aeba78854d20d53aea2bdacf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17a7df92707685abb581edf44a5831cf3dbc3acd18258d37e520f8fcd8ffe643",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3d2e5fb0063a6b77aadea73596ab9db65e8f55ffaa61a2878d43886dcc640820",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_2_d0g0v0_Metropolis" : {
+    "CallSha256_2_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/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x2a98c49f8c7bedb5cdd111e492b33def321234bbbdfca78f9a6cbe2422b36ead",
-                    "mixHash" : "0x7fb503c80276ebd3dcf2618bf10d621690589b2bb0783a69388ecffe86f69a82",
-                    "nonce" : "0x4538820a88863cce",
+                    "gasUsed" : "0x01509c",
+                    "hash" : "0xeee7f2e85686a9d9eef072744ba73f1c22ec239d310246630ba71907a9b7f357",
+                    "mixHash" : "0x1caf4d8356a94698431b91941d97df152d42959b0208b2eb3a6a579f550fa665",
+                    "nonce" : "0x2beca701c837a1ea",
                     "number" : "0x01",
                     "parentHash" : "0xebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x291de4e725ceeff2ae9e451fb83aac30c5ed2010ffe3fd97dabf13b7dd927131",
+                    "receiptTrie" : "0xc2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10f",
+                    "stateRoot" : "0x4490d3882cdccfa8b6099b9fb83b095b58baf0b480104b60177710e01e8f33d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0291de4e725ceeff2ae9e451fb83aac30c5ed2010ffe3fd97dabf13b7dd927131a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a07fb503c80276ebd3dcf2618bf10d621690589b2bb0783a69388ecffe86f69a82884538820a88863ccef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0ebd40d9c4e9348e5dd149c09d795e3f1a5e172f10eb415895093178453908a66a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04490d3882cdccfa8b6099b9fb83b095b58baf0b480104b60177710e01e8f33d4a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c2652465226ae2a5005dca898de14df4f7ccc20d13868d51f1f378e3ca87a10fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a01caf4d8356a94698431b91941d97df152d42959b0208b2eb3a6a579f550fa665882beca701c837a1eaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef07882e886d4a8897c51ceb4bd90ad80471a264d7e53ec7de882628482aa298a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a98c49f8c7bedb5cdd111e492b33def321234bbbdfca78f9a6cbe2422b36ead",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xeee7f2e85686a9d9eef072744ba73f1c22ec239d310246630ba71907a9b7f357",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f5509c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a76128c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_d0g0v0.json
index 2a8f04ef6..56c14e0df 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_3_d0g0v0_EIP150" : {
+    "CallSha256_3_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/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015330",
-                    "hash" : "0x484c688b59e1ce795f5fa5012935a10efaaaa400dfd04add856d4a7c55a5b1a1",
-                    "mixHash" : "0x11c87470a4b87a451f29a6864cd3ce833bf01dfc071780da48476f360708f793",
-                    "nonce" : "0xca1a3f1d05660731",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xb06159b7016081264f24af0a17aa21d8e25638ff6514ded2a2f216445fd831aa",
+                    "mixHash" : "0x95cc46aff92f96def6d234402b5ff3eeff6b66103b046335ca84cfb122c8ff30",
+                    "nonce" : "0x509cbe9fa51fd0d0",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0x45304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2d",
-                    "stateRoot" : "0xb3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba045304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a011c87470a4b87a451f29a6864cd3ce833bf01dfc071780da48476f360708f79388ca1a3f1d05660731f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a095cc46aff92f96def6d234402b5ff3eeff6b66103b046335ca84cfb122c8ff3088509cbe9fa51fd0d0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x484c688b59e1ce795f5fa5012935a10efaaaa400dfd04add856d4a7c55a5b1a1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb06159b7016081264f24af0a17aa21d8e25638ff6514ded2a2f216445fd831aa",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55330",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612630",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_3_d0g0v0_EIP158" : {
+    "CallSha256_3_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/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x1f829e8bfddedb2eaf2ec558ce0eba82e2f100f0dacf24cdec676029a2f7b567",
-                    "mixHash" : "0x3d2bb63c56010bc5fb84637a800be5c3e93d1c23e89db26963d52390222db697",
-                    "nonce" : "0x9e3163a2ed082dfe",
+                    "hash" : "0xf140630ff5036deebd797724c5efc36ed57001bc839a642025cb185779998214",
+                    "mixHash" : "0xcc1e23b988fae6280fd4cefa34846b88f0d7c3c54eb4f78c30da01580f44baaa",
+                    "nonce" : "0xabe92ef1a17f5d79",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0x3fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293def",
-                    "stateRoot" : "0x3ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0d",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293defb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a03d2bb63c56010bc5fb84637a800be5c3e93d1c23e89db26963d52390222db697889e3163a2ed082dfef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0cc1e23b988fae6280fd4cefa34846b88f0d7c3c54eb4f78c30da01580f44baaa88abe92ef1a17f5d79f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f829e8bfddedb2eaf2ec558ce0eba82e2f100f0dacf24cdec676029a2f7b567",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf140630ff5036deebd797724c5efc36ed57001bc839a642025cb185779998214",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_3_d0g0v0_Frontier" : {
+    "CallSha256_3_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/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01509c",
-                    "hash" : "0x55b9befcee0dc4aaf5bd2b5ca5fc9fbf53a3495c8bf063d035e38a348eceb3c6",
-                    "mixHash" : "0xb635074a311a03ac5061ce4bc8f33224ab8171fc959e1a452c0772bf97b9cbd9",
-                    "nonce" : "0x6035518037d538d3",
+                    "gasUsed" : "0x015330",
+                    "hash" : "0x7466274234f1cd61cf331fe4d5f841a3910ab0bcb1b5ef14d11936414215e33b",
+                    "mixHash" : "0x5ec5abafe38e6a752e8a1bdd834b22b240b35b70345a2bf78f50bed4e29c705c",
+                    "nonce" : "0x397318d449749c89",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0xbbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08",
-                    "stateRoot" : "0x50b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8",
+                    "receiptTrie" : "0x45304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2d",
+                    "stateRoot" : "0xb3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0b635074a311a03ac5061ce4bc8f33224ab8171fc959e1a452c0772bf97b9cbd9886035518037d538d3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba045304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a05ec5abafe38e6a752e8a1bdd834b22b240b35b70345a2bf78f50bed4e29c705c88397318d449749c89f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55b9befcee0dc4aaf5bd2b5ca5fc9fbf53a3495c8bf063d035e38a348eceb3c6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7466274234f1cd61cf331fe4d5f841a3910ab0bcb1b5ef14d11936414215e33b",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5509c",
+                "balance" : "0x4563918244f55330",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128c4",
+                "balance" : "0x0de0b6b3a7612630",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_3_d0g0v0_Homestead" : {
+    "CallSha256_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xf5e1f25416e8d3bc19088347221a483454637cb873e101a39f1c8156a1d38427",
+                    "mixHash" : "0x5b6813a10acac6c18998beddd02d3a0b96b99a4cd5f597d281f0218b045f65f8",
+                    "nonce" : "0xbb416615a481f3f0",
+                    "number" : "0x01",
+                    "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
+                    "receiptTrie" : "0x3fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293def",
+                    "stateRoot" : "0x3ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293defb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a05b6813a10acac6c18998beddd02d3a0b96b99a4cd5f597d281f0218b045f65f888bb416615a481f3f0f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf5e1f25416e8d3bc19088347221a483454637cb873e101a39f1c8156a1d38427",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_3_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/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01509c",
-                    "hash" : "0x751218c0ac8bf28ca39e6a5c14d2d0bf8dd835aeb5147e6ca959556cabd93e81",
-                    "mixHash" : "0x635054713925f0257cfacc8cba767dad8547e7339536a750da7201e30b6e8107",
-                    "nonce" : "0x6d4a1c9fda677fb4",
+                    "hash" : "0xabfaf4578c383e4061102300c4d7567172368a423043f2c29e97419d9ce38378",
+                    "mixHash" : "0xcef1ebfe354d2d9cab4f4a82d8bb06e690621829f60409f026e47a3cd674e45b",
+                    "nonce" : "0xbfe3d29fc9ef09b9",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
                     "receiptTrie" : "0xbbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0635054713925f0257cfacc8cba767dad8547e7339536a750da7201e30b6e8107886d4a1c9fda677fb4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0cef1ebfe354d2d9cab4f4a82d8bb06e690621829f60409f026e47a3cd674e45b88bfe3d29fc9ef09b9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x751218c0ac8bf28ca39e6a5c14d2d0bf8dd835aeb5147e6ca959556cabd93e81",
-        "network" : "Homestead",
+        "lastblockhash" : "0xabfaf4578c383e4061102300c4d7567172368a423043f2c29e97419d9ce38378",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_3_d0g0v0_Metropolis" : {
+    "CallSha256_3_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/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x77ebd130f3f3be76437070cdc5ceeb2428feb0b2de7b227907e5755b1446e720",
-                    "mixHash" : "0x820f77d7e282e9d9e0f24c47acdc70aa9e97b6ebda20541a89b148019a223e9d",
-                    "nonce" : "0x3bf7e05b7933c0d2",
+                    "gasUsed" : "0x01509c",
+                    "hash" : "0x5c6af30b8befb3f929692bd109d82d9578a0bdfbe621c1eaace1bde8b6350def",
+                    "mixHash" : "0xd874918586c87f0cea12b0c47b1efd62cd01080aad01532cfe447d1caf9d17f6",
+                    "nonce" : "0x020072ec9b8d04ed",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583",
+                    "receiptTrie" : "0xbbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08",
+                    "stateRoot" : "0x50b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0820f77d7e282e9d9e0f24c47acdc70aa9e97b6ebda20541a89b148019a223e9d883bf7e05b7933c0d2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0d874918586c87f0cea12b0c47b1efd62cd01080aad01532cfe447d1caf9d17f688020072ec9b8d04edf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77ebd130f3f3be76437070cdc5ceeb2428feb0b2de7b227907e5755b1446e720",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5c6af30b8befb3f929692bd109d82d9578a0bdfbe621c1eaace1bde8b6350def",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f5509c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a76128c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0.json
index 91e636245..5060b955b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_3_postfix0_d0g0v0_EIP150" : {
+    "CallSha256_3_postfix0_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/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015330",
-                    "hash" : "0x90c73db7a1372347b6479f61bdfcc2dbd130787ffeaa6bcaf6106d2a79eaf21a",
-                    "mixHash" : "0x302eed83da3adaa4cfebd9868881c78b3d043ff3f08c3a84622689f0d04c5bb4",
-                    "nonce" : "0xce728164b91cd692",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x5f39a37c04c29db103528880fc9fc150cd968d89cfa86f26eaa28d0ee1f52a8a",
+                    "mixHash" : "0x28f0061a855de3b2dc4f8bdc7cfd717a2374abcad53a0fd103714175f626507e",
+                    "nonce" : "0xd0ef92dbc924810e",
                     "number" : "0x01",
                     "parentHash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
-                    "receiptTrie" : "0x738c762f79a69165819bb8a84b868cfbf5b2523b427afd554c3dd920713f74c9",
-                    "stateRoot" : "0x2a95203319d44afee0cb52535ef375a03bc541bc412755ee68fcc9dcf74fa244",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x8e58d6cb3a418a14b896d085bb003c12868f314085d805031360902386128177",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a95203319d44afee0cb52535ef375a03bc541bc412755ee68fcc9dcf74fa244a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0738c762f79a69165819bb8a84b868cfbf5b2523b427afd554c3dd920713f74c9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a0302eed83da3adaa4cfebd9868881c78b3d043ff3f08c3a84622689f0d04c5bb488ce728164b91cd692f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e58d6cb3a418a14b896d085bb003c12868f314085d805031360902386128177a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a028f0061a855de3b2dc4f8bdc7cfd717a2374abcad53a0fd103714175f626507e88d0ef92dbc924810ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90c73db7a1372347b6479f61bdfcc2dbd130787ffeaa6bcaf6106d2a79eaf21a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5f39a37c04c29db103528880fc9fc150cd968d89cfa86f26eaa28d0ee1f52a8a",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55330",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612630",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_3_postfix0_d0g0v0_EIP158" : {
+    "CallSha256_3_postfix0_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/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x891adad12fdc316099d6c84a69028eb4147d041ac646b94ec4f8b6fd0e1a4cdc",
-                    "mixHash" : "0x2e21a81ddd156e6f047b583c252eee90a643553c6042ef67f77cdc74472625e1",
-                    "nonce" : "0xb9e1e309974d1b1d",
+                    "hash" : "0x39c90f059ab7a32654a475256c95922a74a1a5a33646f8ae3111e850b535f599",
+                    "mixHash" : "0xac9f24ec75f2c0123573f8b30e82278bfe22bd53810243ee29ec4efffdafd4f7",
+                    "nonce" : "0x0b341f708f2122a4",
                     "number" : "0x01",
                     "parentHash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
-                    "receiptTrie" : "0x22cf8f3ebf1fbbd604055159e67d49892fdc7f54772f917ddcff31241142360c",
-                    "stateRoot" : "0xee05e0d9059423e92116b1a3c2f6016922bc97e567906fcb7862750456510703",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x8e58d6cb3a418a14b896d085bb003c12868f314085d805031360902386128177",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee05e0d9059423e92116b1a3c2f6016922bc97e567906fcb7862750456510703a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba022cf8f3ebf1fbbd604055159e67d49892fdc7f54772f917ddcff31241142360cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a02e21a81ddd156e6f047b583c252eee90a643553c6042ef67f77cdc74472625e188b9e1e309974d1b1df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e58d6cb3a418a14b896d085bb003c12868f314085d805031360902386128177a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0ac9f24ec75f2c0123573f8b30e82278bfe22bd53810243ee29ec4efffdafd4f7880b341f708f2122a4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x891adad12fdc316099d6c84a69028eb4147d041ac646b94ec4f8b6fd0e1a4cdc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x39c90f059ab7a32654a475256c95922a74a1a5a33646f8ae3111e850b535f599",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x65f34578907f006000526020600060256000600060026101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_3_postfix0_d0g0v0_Frontier" : {
+    "CallSha256_3_postfix0_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/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01509c",
-                    "hash" : "0x4815a6d14957360d34116868aa721a360345276a2da80b937c40d5af0fc011ec",
-                    "mixHash" : "0x064a921b65b6ce0e3e47af432057fc7e84d96849545f0228cb628a29d3b75595",
-                    "nonce" : "0x7707262bfff71765",
+                    "gasUsed" : "0x015330",
+                    "hash" : "0x0818319aaa020ca55f542575a8b84f2445c2e0270236deab14c328b1a4a4925f",
+                    "mixHash" : "0x25d6df386b67456e707f3a9f2edb2e58fd1c23e8f7c94f8a1cfe789e5be6a5fb",
+                    "nonce" : "0x0c9b87d583cd5f8d",
                     "number" : "0x01",
                     "parentHash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
-                    "receiptTrie" : "0x515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570d",
-                    "stateRoot" : "0xc74c8d4282684682d5415772ea496db8ac862cc683cffe375025329402c12110",
+                    "receiptTrie" : "0x738c762f79a69165819bb8a84b868cfbf5b2523b427afd554c3dd920713f74c9",
+                    "stateRoot" : "0x2a95203319d44afee0cb52535ef375a03bc541bc412755ee68fcc9dcf74fa244",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c74c8d4282684682d5415772ea496db8ac862cc683cffe375025329402c12110a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0064a921b65b6ce0e3e47af432057fc7e84d96849545f0228cb628a29d3b75595887707262bfff71765f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a95203319d44afee0cb52535ef375a03bc541bc412755ee68fcc9dcf74fa244a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0738c762f79a69165819bb8a84b868cfbf5b2523b427afd554c3dd920713f74c9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a025d6df386b67456e707f3a9f2edb2e58fd1c23e8f7c94f8a1cfe789e5be6a5fb880c9b87d583cd5f8df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4815a6d14957360d34116868aa721a360345276a2da80b937c40d5af0fc011ec",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0818319aaa020ca55f542575a8b84f2445c2e0270236deab14c328b1a4a4925f",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5509c",
+                "balance" : "0x4563918244f55330",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128c4",
+                "balance" : "0x0de0b6b3a7612630",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_3_postfix0_d0g0v0_Homestead" : {
+    "CallSha256_3_postfix0_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xd7ebf53693f347251df21486a43afaef38ba06928c04427ed60276de629afa1e",
+                    "mixHash" : "0x19d143c763231fd97b3ccc91bca0ea4945bee548080dbdb3eba6deda7ed750f5",
+                    "nonce" : "0x27ab8e7f0a3130bf",
+                    "number" : "0x01",
+                    "parentHash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
+                    "receiptTrie" : "0x22cf8f3ebf1fbbd604055159e67d49892fdc7f54772f917ddcff31241142360c",
+                    "stateRoot" : "0xee05e0d9059423e92116b1a3c2f6016922bc97e567906fcb7862750456510703",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee05e0d9059423e92116b1a3c2f6016922bc97e567906fcb7862750456510703a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba022cf8f3ebf1fbbd604055159e67d49892fdc7f54772f917ddcff31241142360cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a019d143c763231fd97b3ccc91bca0ea4945bee548080dbdb3eba6deda7ed750f58827ab8e7f0a3130bff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd7ebf53693f347251df21486a43afaef38ba06928c04427ed60276de629afa1e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x65f34578907f006000526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x3b745a1c00d035c334f358d007a430e4cf0ae63aa0556fb05529706de546464d",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x65f34578907f006000526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_3_postfix0_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/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01509c",
-                    "hash" : "0x311728a870b917cda7ffda0b6f11e886bf61e9fb9b6124e63391f4a262f8f752",
-                    "mixHash" : "0x89654580bde7581be96e6c95f709f800f6922dcd6b63b4c09958e11c201f882f",
-                    "nonce" : "0x3d6a0e4718406030",
+                    "hash" : "0xeabab6006724996db0b7bb20230c6bc9732da5cad8cb7a9e174520f3eb77515e",
+                    "mixHash" : "0x75ee04715045b6fb4eddaaccc982963e27f48508e81da3f95a08443c60df2ecd",
+                    "nonce" : "0x02761bbee2a4dfd1",
                     "number" : "0x01",
                     "parentHash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
                     "receiptTrie" : "0x515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570d",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c74c8d4282684682d5415772ea496db8ac862cc683cffe375025329402c12110a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a089654580bde7581be96e6c95f709f800f6922dcd6b63b4c09958e11c201f882f883d6a0e4718406030f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c74c8d4282684682d5415772ea496db8ac862cc683cffe375025329402c12110a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a075ee04715045b6fb4eddaaccc982963e27f48508e81da3f95a08443c60df2ecd8802761bbee2a4dfd1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x311728a870b917cda7ffda0b6f11e886bf61e9fb9b6124e63391f4a262f8f752",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeabab6006724996db0b7bb20230c6bc9732da5cad8cb7a9e174520f3eb77515e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_3_postfix0_d0g0v0_Metropolis" : {
+    "CallSha256_3_postfix0_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/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0xc98c666c1ce1c2ecaf967e00697d49d066685a18b4cefc6ae8c566382c13c4ca",
-                    "mixHash" : "0xe163720d14d4be9c02cfba345ca8a659557116d3b437a5efc20147e0237236ba",
-                    "nonce" : "0x4bd3faf9315333e9",
+                    "gasUsed" : "0x01509c",
+                    "hash" : "0xc899dc5a3946a8619f47658061faf7d844a763c206911f0393b157205ba1c881",
+                    "mixHash" : "0x4c5540deacb9b1b72bcc0d7973324d527da35d9dc684141b8c0964fa24a1e215",
+                    "nonce" : "0xa9162131e32a5c66",
                     "number" : "0x01",
                     "parentHash" : "0xa2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x8e58d6cb3a418a14b896d085bb003c12868f314085d805031360902386128177",
+                    "receiptTrie" : "0x515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570d",
+                    "stateRoot" : "0xc74c8d4282684682d5415772ea496db8ac862cc683cffe375025329402c12110",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e58d6cb3a418a14b896d085bb003c12868f314085d805031360902386128177a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0e163720d14d4be9c02cfba345ca8a659557116d3b437a5efc20147e0237236ba884bd3faf9315333e9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0a2ec3c4c3e736d340fd298dde6bd833e15aa06c259c1becad3e2ebaec7a2b798a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c74c8d4282684682d5415772ea496db8ac862cc683cffe375025329402c12110a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0515f7018e8b15016a4ea2dfdd5261b12ff36caa643e777e3f75c8fe31ea7570db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a04c5540deacb9b1b72bcc0d7973324d527da35d9dc684141b8c0964fa24a1e21588a9162131e32a5c66f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e708ab8ba5dfb91b591ef800aeb56860ae74b8a4a0660e0476fadb547a6f2f15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc98c666c1ce1c2ecaf967e00697d49d066685a18b4cefc6ae8c566382c13c4ca",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc899dc5a3946a8619f47658061faf7d844a763c206911f0393b157205ba1c881",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f5509c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a76128c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0.json
index d42e4ffc0..e8d226c62 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_3_prefix0_d0g0v0_EIP150" : {
+    "CallSha256_3_prefix0_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/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015330",
-                    "hash" : "0xb95e086be8b3469e759fe62b5c1b65a5b864ac5abe7fceca7c56b5696d73b52d",
-                    "mixHash" : "0xffd52c1f506aaa60f1a4d2b87b5b5fe514a35b1c3c1d069776278b343fb2206e",
-                    "nonce" : "0x2bb44c70d5e2b956",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x4aa2f7215d79774dc50fd900b609d41545fb79dafed8ef2e2d3d46e6080a6531",
+                    "mixHash" : "0x0d50ad3f4135c5817fe741e441d19f93ea2a7b1228024d63f5d1edeb34551c0a",
+                    "nonce" : "0x259f29115dac8c52",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0x45304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2d",
-                    "stateRoot" : "0xb3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba045304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a0ffd52c1f506aaa60f1a4d2b87b5b5fe514a35b1c3c1d069776278b343fb2206e882bb44c70d5e2b956f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a00d50ad3f4135c5817fe741e441d19f93ea2a7b1228024d63f5d1edeb34551c0a88259f29115dac8c52f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb95e086be8b3469e759fe62b5c1b65a5b864ac5abe7fceca7c56b5696d73b52d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4aa2f7215d79774dc50fd900b609d41545fb79dafed8ef2e2d3d46e6080a6531",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55330",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7612630",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_3_prefix0_d0g0v0_EIP158" : {
+    "CallSha256_3_prefix0_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/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x5cb45ff316e17666c534e2ac66e19ea35cbdde7aa6d17c5853815977760a9c52",
-                    "mixHash" : "0xa322ce32b7349c72ca9f005413ce777178d76d6bc01862844c30448c31ea9b5e",
-                    "nonce" : "0x2e3b6f1808fa2ae2",
+                    "hash" : "0xcac6ded221e385ccd43536cb11373c883135cdfcedc5b58d9455ee6adc70fc54",
+                    "mixHash" : "0x8d359f42558dd35f79d8418a3fd0e0b25b59d4e8cc4212891198599ab9aa6116",
+                    "nonce" : "0x35f4e88f35bc254a",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0x3fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293def",
-                    "stateRoot" : "0x3ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0d",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293defb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a322ce32b7349c72ca9f005413ce777178d76d6bc01862844c30448c31ea9b5e882e3b6f1808fa2ae2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a08d359f42558dd35f79d8418a3fd0e0b25b59d4e8cc4212891198599ab9aa61168835f4e88f35bc254af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cb45ff316e17666c534e2ac66e19ea35cbdde7aa6d17c5853815977760a9c52",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcac6ded221e385ccd43536cb11373c883135cdfcedc5b58d9455ee6adc70fc54",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_3_prefix0_d0g0v0_Frontier" : {
+    "CallSha256_3_prefix0_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/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01509c",
-                    "hash" : "0x200d17dc7e6e991a37cbd8fd4ddcd1e44723df3508af122c9576781f17153191",
-                    "mixHash" : "0xa568ecee824eecd21a3f301dbc64f5e0fc7e552ff4a4e3e47a3a555b5564e289",
-                    "nonce" : "0xbf57423e81c18f0a",
+                    "gasUsed" : "0x015330",
+                    "hash" : "0xf3477335f50bf9d83045150a7ba66ef2717cb779a4fddd7efb50d7ee28de1820",
+                    "mixHash" : "0x0b560c8135f7fe90ea9139b2ec342897030bf175951ee6529d106460fd9fe0db",
+                    "nonce" : "0xfb1b48df89561ba5",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0xbbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08",
-                    "stateRoot" : "0x50b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8",
+                    "receiptTrie" : "0x45304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2d",
+                    "stateRoot" : "0xb3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0a568ecee824eecd21a3f301dbc64f5e0fc7e552ff4a4e3e47a3a555b5564e28988bf57423e81c18f0af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3d4cf749af8533a634c3d058a3b8d7928cd220d1ed4833e32512fc785517d78a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba045304bc4073c5ef051262326e008dfcf7e4fbfb0d988b87771a01eb30ff50b2db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153308203e880a00b560c8135f7fe90ea9139b2ec342897030bf175951ee6529d106460fd9fe0db88fb1b48df89561ba5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x200d17dc7e6e991a37cbd8fd4ddcd1e44723df3508af122c9576781f17153191",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf3477335f50bf9d83045150a7ba66ef2717cb779a4fddd7efb50d7ee28de1820",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5509c",
+                "balance" : "0x4563918244f55330",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128c4",
+                "balance" : "0x0de0b6b3a7612630",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_3_prefix0_d0g0v0_Homestead" : {
+    "CallSha256_3_prefix0_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x6881255a546d09ffe7ff7387e81ce6b450b987e1ae45e00f11430e4aa8c1f180",
+                    "mixHash" : "0x5dbf8bcf7095975470ff368153253bf2d7a95af36cbfd2a63420372caf1f76de",
+                    "nonce" : "0x3df0282210773f56",
+                    "number" : "0x01",
+                    "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
+                    "receiptTrie" : "0x3fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293def",
+                    "stateRoot" : "0x3ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ffd641c9e7a51d3aa09db3e4d1e39a51b16fd5a360ed1fb0c3a263ab074ab0da098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba03fa296f09221a1c90997bb75895dc7335550ea4973b802a67169a8af56293defb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a05dbf8bcf7095975470ff368153253bf2d7a95af36cbfd2a63420372caf1f76de883df0282210773f56f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6881255a546d09ffe7ff7387e81ce6b450b987e1ae45e00f11430e4aa8c1f180",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_3_prefix0_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/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01509c",
-                    "hash" : "0x6b74ea19bd9cec24430b6cf8ef1dfedb661e756feda85bf166c3b07aa91f79ed",
-                    "mixHash" : "0xa0c056f08f173fad666415b597f41179413a4e0b803f4105a18e0cf86002e7ce",
-                    "nonce" : "0xdc466ceef04f77b1",
+                    "hash" : "0xa3aa2dca9ed9d004adda3172a05f08e6d56b11b0ea1dfffc8b00dbdddd1826e8",
+                    "mixHash" : "0x29a8403e099d9e0d42cda36bb52796359d07d2f31a878497b0acee768e4d7370",
+                    "nonce" : "0xe7213407de5280ba",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
                     "receiptTrie" : "0xbbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0a0c056f08f173fad666415b597f41179413a4e0b803f4105a18e0cf86002e7ce88dc466ceef04f77b1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a029a8403e099d9e0d42cda36bb52796359d07d2f31a878497b0acee768e4d737088e7213407de5280baf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b74ea19bd9cec24430b6cf8ef1dfedb661e756feda85bf166c3b07aa91f79ed",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa3aa2dca9ed9d004adda3172a05f08e6d56b11b0ea1dfffc8b00dbdddd1826e8",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_3_prefix0_d0g0v0_Metropolis" : {
+    "CallSha256_3_prefix0_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/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x1518c8bf931b719b629d5dcb94ec674d86e7f86bc922d1fdb42e3c5243d5cc9a",
-                    "mixHash" : "0x8b2b7d61d7f9eafa359834f35d7397777c2a793196cd9191bb36b470d8287de8",
-                    "nonce" : "0xb002f82fd93b2de3",
+                    "gasUsed" : "0x01509c",
+                    "hash" : "0x628e8cc6386962acfcc6bc7758f88296ea0055dfab4fd0ec0919b1f119a3fed4",
+                    "mixHash" : "0xbf473f73baabc2ce0f189a37559e1f1b1235082ef02dcfd2e484ee30ac976bb8",
+                    "nonce" : "0xae7f1e212ae81a11",
                     "number" : "0x01",
                     "parentHash" : "0x13147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583",
+                    "receiptTrie" : "0xbbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08",
+                    "stateRoot" : "0x50b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0812eec8910c509223ca0b745ae75b789d0449841f7091084e898f843ddb26583a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a08b2b7d61d7f9eafa359834f35d7397777c2a793196cd9191bb36b470d8287de888b002f82fd93b2de3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a013147167bf6174ef2f4194e19818cc4dd1a02aa0ac5681e5816eb627b15eeeb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050b98f5f5c537f4bb20c68b240b3f66c148b7ff737aa064e9166b81eef25d5c8a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bbf9657d9bd2d13ead9e4daf2572fb379c8650bf29931bbb1d06f84f6d06cb08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301509c8203e880a0bf473f73baabc2ce0f189a37559e1f1b1235082ef02dcfd2e484ee30ac976bb888ae7f1e212ae81a11f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb15f34d797d0a14eb28284bbd42df05bdedf21d0a53529faed643bd8a61e89ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1518c8bf931b719b629d5dcb94ec674d86e7f86bc922d1fdb42e3c5243d5cc9a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x628e8cc6386962acfcc6bc7758f88296ea0055dfab4fd0ec0919b1f119a3fed4",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f5509c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a76128c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_d0g0v0.json
index aa278f345..fa1ce94e4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_4_d0g0v0_EIP150" : {
+    "CallSha256_4_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/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015321",
-                    "hash" : "0xa902d4b5a59aa9aa6a62e52ab9027e121a66a1cb6ee69575373ae25e7a6a9d33",
-                    "mixHash" : "0xfddcd1de6adf167d8413aef50d9d27b9237c762550b7ad5b4e2fec5272132db6",
-                    "nonce" : "0x6cf8901720af3199",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0x88d3e5b787c1cb0f8a06a5fb8e804560feabc62c90b8de0f8772503044178b45",
+                    "mixHash" : "0x09923e39b80b77b31eb027a9c0eec4b2cb3b41e310755460bdf218edbc036068",
+                    "nonce" : "0xd30ab783e37c4694",
                     "number" : "0x01",
                     "parentHash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
-                    "receiptTrie" : "0x007d0346fcc889f700b092a492e24d3a28dd31ac0bbf4170f9595241da6c5d6b",
-                    "stateRoot" : "0x535be27b01a942c2eb9aa4b5feaffc36203605718cd6dcaabfa293bfc0f85527",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0x45caaa861630f7b58da847f8ae2dfba9e24348c16d2a67c3935be25bd7498d89",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0535be27b01a942c2eb9aa4b5feaffc36203605718cd6dcaabfa293bfc0f85527a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0007d0346fcc889f700b092a492e24d3a28dd31ac0bbf4170f9595241da6c5d6bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153218203e880a0fddcd1de6adf167d8413aef50d9d27b9237c762550b7ad5b4e2fec5272132db6886cf8901720af3199f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045caaa861630f7b58da847f8ae2dfba9e24348c16d2a67c3935be25bd7498d89a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a009923e39b80b77b31eb027a9c0eec4b2cb3b41e310755460bdf218edbc03606888d30ab783e37c4694f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa902d4b5a59aa9aa6a62e52ab9027e121a66a1cb6ee69575373ae25e7a6a9d33",
-        "network" : "EIP150",
+        "lastblockhash" : "0x88d3e5b787c1cb0f8a06a5fb8e804560feabc62c90b8de0f8772503044178b45",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55321",
+                "balance" : "0x4563918244f4f179",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761263f",
+                "balance" : "0x0de0b6b3a76187e7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_4_d0g0v0_EIP158" : {
+    "CallSha256_4_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/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf179",
-                    "hash" : "0x82d0382c274438f9bb0f1d79fd407b2926adccdc3211b4657e236c4f90d63609",
-                    "mixHash" : "0x852d27b5f07721f099f7420af58ceaaf915328e2b2190be2d6e88e5375068e13",
-                    "nonce" : "0x44436b56ece435d8",
+                    "hash" : "0x6b49d89e455e97ecc58eed0d54489f7a876c35fc018e021ff1dc94e0a01ff6b9",
+                    "mixHash" : "0xddc2962c71833ecc60004756fdb13e4e1df56337247d33867659e42446c1946d",
+                    "nonce" : "0x92915872f800c0b4",
                     "number" : "0x01",
                     "parentHash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
-                    "receiptTrie" : "0x226c00932fcf6d38421f501891086526fadfc86e6eff0b62cc62cc380a08d358",
-                    "stateRoot" : "0x7e997d8e764e5e321b03c998be948980b53e3ddae472c5cc98eb491e98bb58b1",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0x45caaa861630f7b58da847f8ae2dfba9e24348c16d2a67c3935be25bd7498d89",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e997d8e764e5e321b03c998be948980b53e3ddae472c5cc98eb491e98bb58b1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0226c00932fcf6d38421f501891086526fadfc86e6eff0b62cc62cc380a08d358b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0852d27b5f07721f099f7420af58ceaaf915328e2b2190be2d6e88e5375068e138844436b56ece435d8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045caaa861630f7b58da847f8ae2dfba9e24348c16d2a67c3935be25bd7498d89a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0ddc2962c71833ecc60004756fdb13e4e1df56337247d33867659e42446c1946d8892915872f800c0b4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82d0382c274438f9bb0f1d79fd407b2926adccdc3211b4657e236c4f90d63609",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6b49d89e455e97ecc58eed0d54489f7a876c35fc018e021ff1dc94e0a01ff6b9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_4_d0g0v0_Frontier" : {
+    "CallSha256_4_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/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01508d",
-                    "hash" : "0x4e855ca378fce832ade3ac8a0b3213b65eb96f41c7ee25560bac0221329ba7b0",
-                    "mixHash" : "0x970a12d025fe9dd7dbb9ece39030e7433c74674ff7659c99f3b158ab064bbffc",
-                    "nonce" : "0x5e894c644bd4cc22",
+                    "gasUsed" : "0x015321",
+                    "hash" : "0x57d5b9cd3db7da73088685830e6f827c32436283c14d235efaaeb209e6da9853",
+                    "mixHash" : "0xd098d68b7805e7d31043683666716fde5f636e1f3e1d19bf1b9af9cb44af7bd5",
+                    "nonce" : "0xbd29cac718ba4d2e",
                     "number" : "0x01",
                     "parentHash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
-                    "receiptTrie" : "0x6b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5c",
-                    "stateRoot" : "0x435e4e4acdcceb218219ad3bb8c51ac930f3cc7a7d150051de62cc4709ded57c",
+                    "receiptTrie" : "0x007d0346fcc889f700b092a492e24d3a28dd31ac0bbf4170f9595241da6c5d6b",
+                    "stateRoot" : "0x535be27b01a942c2eb9aa4b5feaffc36203605718cd6dcaabfa293bfc0f85527",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0435e4e4acdcceb218219ad3bb8c51ac930f3cc7a7d150051de62cc4709ded57ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a0970a12d025fe9dd7dbb9ece39030e7433c74674ff7659c99f3b158ab064bbffc885e894c644bd4cc22f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0535be27b01a942c2eb9aa4b5feaffc36203605718cd6dcaabfa293bfc0f85527a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0007d0346fcc889f700b092a492e24d3a28dd31ac0bbf4170f9595241da6c5d6bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153218203e880a0d098d68b7805e7d31043683666716fde5f636e1f3e1d19bf1b9af9cb44af7bd588bd29cac718ba4d2ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e855ca378fce832ade3ac8a0b3213b65eb96f41c7ee25560bac0221329ba7b0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x57d5b9cd3db7da73088685830e6f827c32436283c14d235efaaeb209e6da9853",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5508d",
+                "balance" : "0x4563918244f55321",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128d3",
+                "balance" : "0x0de0b6b3a761263f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_4_d0g0v0_Homestead" : {
+    "CallSha256_4_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0xa28595adaeefdd97af922e2969090c81857edc7c65a6ffeffa7bde4b738ff1de",
+                    "mixHash" : "0xa128245e4411c9112f996e87c136291e009c42970170106ec783dc3d65a3b86a",
+                    "nonce" : "0x61e8167c26748dfc",
+                    "number" : "0x01",
+                    "parentHash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
+                    "receiptTrie" : "0x226c00932fcf6d38421f501891086526fadfc86e6eff0b62cc62cc380a08d358",
+                    "stateRoot" : "0x7e997d8e764e5e321b03c998be948980b53e3ddae472c5cc98eb491e98bb58b1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e997d8e764e5e321b03c998be948980b53e3ddae472c5cc98eb491e98bb58b1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0226c00932fcf6d38421f501891086526fadfc86e6eff0b62cc62cc380a08d358b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0a128245e4411c9112f996e87c136291e009c42970170106ec783dc3d65a3b86a8861e8167c26748dfcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa28595adaeefdd97af922e2969090c81857edc7c65a6ffeffa7bde4b738ff1de",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f179",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187e7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_4_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/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01508d",
-                    "hash" : "0x2a8f50120afe5715fd84e6ff24f78e398468d007554c4d5259d387beb4725bef",
-                    "mixHash" : "0x4ad72ac1b2e16d6e0be2b395776bdad016c41d4d721c2aa363eb6938a427412b",
-                    "nonce" : "0xd2f7dbebbbe065b2",
+                    "hash" : "0x72a0be4989a3bc3bf565cd25261cd44e47c7fe9a1aef49c8104478c863a953b7",
+                    "mixHash" : "0xd9927835c82b1a41f2e819d92ac871272ba63aaef31c87275bbf41943560e44f",
+                    "nonce" : "0x42c7afa25c4b111c",
                     "number" : "0x01",
                     "parentHash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
                     "receiptTrie" : "0x6b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5c",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0435e4e4acdcceb218219ad3bb8c51ac930f3cc7a7d150051de62cc4709ded57ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a04ad72ac1b2e16d6e0be2b395776bdad016c41d4d721c2aa363eb6938a427412b88d2f7dbebbbe065b2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0435e4e4acdcceb218219ad3bb8c51ac930f3cc7a7d150051de62cc4709ded57ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a0d9927835c82b1a41f2e819d92ac871272ba63aaef31c87275bbf41943560e44f8842c7afa25c4b111cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a8f50120afe5715fd84e6ff24f78e398468d007554c4d5259d387beb4725bef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x72a0be4989a3bc3bf565cd25261cd44e47c7fe9a1aef49c8104478c863a953b7",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_4_d0g0v0_Metropolis" : {
+    "CallSha256_4_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/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf179",
-                    "hash" : "0x1e239189abb30b88ce6d50887474944f3ee392a909094dc6329614bc2a916115",
-                    "mixHash" : "0x6cbec019089c2bfcfccdf041059d0fd3f8e3d6efb49e7fdea68337c46db29869",
-                    "nonce" : "0x24dcc785167fe9e3",
+                    "gasUsed" : "0x01508d",
+                    "hash" : "0xca2c6e839aec939811d645edb28ded61d6bf5003c445e225df533bdd8fe81490",
+                    "mixHash" : "0xd5c2ed48b00b476f603132f457edf1d01b20876f31502d4083ae9758642bdde5",
+                    "nonce" : "0x18e8a0d17ae8de57",
                     "number" : "0x01",
                     "parentHash" : "0x648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06c",
-                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
-                    "stateRoot" : "0x45caaa861630f7b58da847f8ae2dfba9e24348c16d2a67c3935be25bd7498d89",
+                    "receiptTrie" : "0x6b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5c",
+                    "stateRoot" : "0x435e4e4acdcceb218219ad3bb8c51ac930f3cc7a7d150051de62cc4709ded57c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045caaa861630f7b58da847f8ae2dfba9e24348c16d2a67c3935be25bd7498d89a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a06cbec019089c2bfcfccdf041059d0fd3f8e3d6efb49e7fdea68337c46db298698824dcc785167fe9e3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0648f142a372b479ee14c708c9cb4856cdff4c16a76e0bbad2aa4b6dcc3e4e06ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0435e4e4acdcceb218219ad3bb8c51ac930f3cc7a7d150051de62cc4709ded57ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba06b5c9df1f6775e5a73eedba97c0ee642a9b4b7e1d8b8886a2544f4bd2c3b9f5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a0d5c2ed48b00b476f603132f457edf1d01b20876f31502d4083ae9758642bdde58818e8a0d17ae8de57f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802c8959658c5f570a153ea0ccacdc4595f481cd38b6d979679014af3d76bb1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e239189abb30b88ce6d50887474944f3ee392a909094dc6329614bc2a916115",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xca2c6e839aec939811d645edb28ded61d6bf5003c445e225df533bdd8fe81490",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f179",
+                "balance" : "0x4563918244f5508d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187e7",
+                "balance" : "0x0de0b6b3a76128d3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0.json
index 0a09aefdc..f994accfb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_4_gas99_d0g0v0_EIP150" : {
+    "CallSha256_4_gas99_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/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015321",
-                    "hash" : "0x89d80948f95b090a3ede294da29236bdd07638b4a260cb0b9053172d2a023146",
-                    "mixHash" : "0x3fd1b32832cd5cd8d5914d37ea854e758b68e95910cc557044ae80bd1c8ee9f0",
-                    "nonce" : "0x91f57b970a49448a",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0x12af1b73b6981d0a5c245e8fc98c010f9305443b0bd5a59e822bd03b52707d8c",
+                    "mixHash" : "0xad18a555e6d764e3fae8d2833c53c849ec981a2be07146b396c653ddf5798baf",
+                    "nonce" : "0x611b4ce9b41b6ef3",
                     "number" : "0x01",
                     "parentHash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
-                    "receiptTrie" : "0xf2a2eb24131dc71d1698e54b7371fac7fd23e1dac787ec4ecd236bed71be9da6",
-                    "stateRoot" : "0xead22a9a758d80edb164b78ab2984d97ad8888e538cd4c8bf9096d65f4e431cb",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0xe9a7e55ac2f3ad672a5199b3c2d2f1201b51e1efeb162a92de57711d44a907a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead22a9a758d80edb164b78ab2984d97ad8888e538cd4c8bf9096d65f4e431cba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f2a2eb24131dc71d1698e54b7371fac7fd23e1dac787ec4ecd236bed71be9da6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153218203e880a03fd1b32832cd5cd8d5914d37ea854e758b68e95910cc557044ae80bd1c8ee9f08891f57b970a49448af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9a7e55ac2f3ad672a5199b3c2d2f1201b51e1efeb162a92de57711d44a907a9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0ad18a555e6d764e3fae8d2833c53c849ec981a2be07146b396c653ddf5798baf88611b4ce9b41b6ef3f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89d80948f95b090a3ede294da29236bdd07638b4a260cb0b9053172d2a023146",
-        "network" : "EIP150",
+        "lastblockhash" : "0x12af1b73b6981d0a5c245e8fc98c010f9305443b0bd5a59e822bd03b52707d8c",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000002" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55321",
+                "balance" : "0x4563918244f4f179",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761263f",
+                "balance" : "0x0de0b6b3a76187e7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -113,10 +113,10 @@
             }
         }
     },
-    "CallSha256_4_gas99_d0g0v0_EIP158" : {
+    "CallSha256_4_gas99_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/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf179",
-                    "hash" : "0xb7a3fffc55df6ebe376dc1623b38c512a06ee8a16f9fd47b4cc6a3ea3fd5c813",
-                    "mixHash" : "0x76b5d91ccd511668001612fa3f74476dffd0f17a4c64a4c75e7a05a87d6359ba",
-                    "nonce" : "0xca0525c8f51005c2",
+                    "hash" : "0xcac9a89391a3aeaec57d9e69d97b51ea63a816e37cad440b333352a4ac06c8a7",
+                    "mixHash" : "0x08ef78505533f86b00ae919c90054e76c0b6cd29a6cb0f23e7a4a73d2dce9350",
+                    "nonce" : "0xf9b6dee13694513f",
                     "number" : "0x01",
                     "parentHash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
-                    "receiptTrie" : "0x0a208926b3bab36409adf8f282d39631b883a2ac4182e589b10606780ddd098c",
-                    "stateRoot" : "0x5b826030b8ababb9b2b07a600bc08386627cf0e8a1e94a26e6460f2fab1e5d02",
+                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
+                    "stateRoot" : "0xe9a7e55ac2f3ad672a5199b3c2d2f1201b51e1efeb162a92de57711d44a907a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b826030b8ababb9b2b07a600bc08386627cf0e8a1e94a26e6460f2fab1e5d02a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00a208926b3bab36409adf8f282d39631b883a2ac4182e589b10606780ddd098cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a076b5d91ccd511668001612fa3f74476dffd0f17a4c64a4c75e7a05a87d6359ba88ca0525c8f51005c2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9a7e55ac2f3ad672a5199b3c2d2f1201b51e1efeb162a92de57711d44a907a9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a008ef78505533f86b00ae919c90054e76c0b6cd29a6cb0f23e7a4a73d2dce935088f9b6dee13694513ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a3fffc55df6ebe376dc1623b38c512a06ee8a16f9fd47b4cc6a3ea3fd5c813",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcac9a89391a3aeaec57d9e69d97b51ea63a816e37cad440b333352a4ac06c8a7",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f1600255600051600055",
@@ -220,10 +227,10 @@
             }
         }
     },
-    "CallSha256_4_gas99_d0g0v0_Frontier" : {
+    "CallSha256_4_gas99_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/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01508d",
-                    "hash" : "0x1be82091e0df3af224a6bbe4b7dbd0950ae8a09b013e61e4cedda81c47224db1",
-                    "mixHash" : "0x029fcbde3f91eb699d03ad6de5540560d5b97b69851ddaa963a5419117de9228",
-                    "nonce" : "0x7dd8c0ce2a506758",
+                    "gasUsed" : "0x015321",
+                    "hash" : "0x771fed8548306f8efe545a1656a2d8f4940764d13f146f2e2e89381edacc9e7a",
+                    "mixHash" : "0xcca57143d59b78e5eccc588e3e96543cc06e6ac2fb474df8bdb68de18903ec06",
+                    "nonce" : "0x478d4721e0aaee38",
                     "number" : "0x01",
                     "parentHash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
-                    "receiptTrie" : "0xc37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4",
-                    "stateRoot" : "0x43b808cbf61651f523bfaf436f10393d29e18eeec91e647e398ae444e6d01618",
+                    "receiptTrie" : "0xf2a2eb24131dc71d1698e54b7371fac7fd23e1dac787ec4ecd236bed71be9da6",
+                    "stateRoot" : "0xead22a9a758d80edb164b78ab2984d97ad8888e538cd4c8bf9096d65f4e431cb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043b808cbf61651f523bfaf436f10393d29e18eeec91e647e398ae444e6d01618a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a0029fcbde3f91eb699d03ad6de5540560d5b97b69851ddaa963a5419117de9228887dd8c0ce2a506758f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead22a9a758d80edb164b78ab2984d97ad8888e538cd4c8bf9096d65f4e431cba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f2a2eb24131dc71d1698e54b7371fac7fd23e1dac787ec4ecd236bed71be9da6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153218203e880a0cca57143d59b78e5eccc588e3e96543cc06e6ac2fb474df8bdb68de18903ec0688478d4721e0aaee38f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -283,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1be82091e0df3af224a6bbe4b7dbd0950ae8a09b013e61e4cedda81c47224db1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x771fed8548306f8efe545a1656a2d8f4940764d13f146f2e2e89381edacc9e7a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -303,14 +310,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5508d",
+                "balance" : "0x4563918244f55321",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76128d3",
+                "balance" : "0x0de0b6b3a761263f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -334,10 +341,117 @@
             }
         }
     },
-    "CallSha256_4_gas99_d0g0v0_Homestead" : {
+    "CallSha256_4_gas99_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf179",
+                    "hash" : "0xf4f960088e2bcca1fac3ffbf7a42de84841386bbc3217983edbe37a44e2be45f",
+                    "mixHash" : "0x9843e118777a9c467567c5eced6f668e14e95ed0694d8136f455808fbdcc1237",
+                    "nonce" : "0x23f7f43ba5fb8b0b",
+                    "number" : "0x01",
+                    "parentHash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
+                    "receiptTrie" : "0x0a208926b3bab36409adf8f282d39631b883a2ac4182e589b10606780ddd098c",
+                    "stateRoot" : "0x5b826030b8ababb9b2b07a600bc08386627cf0e8a1e94a26e6460f2fab1e5d02",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b826030b8ababb9b2b07a600bc08386627cf0e8a1e94a26e6460f2fab1e5d02a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba00a208926b3bab36409adf8f282d39631b883a2ac4182e589b10606780ddd098cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a09843e118777a9c467567c5eced6f668e14e95ed0694d8136f455808fbdcc12378823f7f43ba5fb8b0bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf4f960088e2bcca1fac3ffbf7a42de84841386bbc3217983edbe37a44e2be45f",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f179",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187e7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_4_gas99_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/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +463,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01508d",
-                    "hash" : "0xcd9fe1acd8a16ff7bd55d11fc9adff53c39e8dd09ba65656abd65a78ffe2e16e",
-                    "mixHash" : "0x7688fe6b127477a9a12b127bbf31a75050b5380896e4cbb238d491be8bc9c62d",
-                    "nonce" : "0xdf6054d8739e51be",
+                    "hash" : "0x0d2e439d37dddbb0c5421ddccea87851ea74d7a511856f9f42397351ff3b4c91",
+                    "mixHash" : "0x3eb5d116c80b124dec3672b93494383c20526b8cd272da617ea6d023013fec44",
+                    "nonce" : "0x81d4e71aba12cef4",
                     "number" : "0x01",
                     "parentHash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
                     "receiptTrie" : "0xc37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4",
@@ -360,7 +474,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043b808cbf61651f523bfaf436f10393d29e18eeec91e647e398ae444e6d01618a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a07688fe6b127477a9a12b127bbf31a75050b5380896e4cbb238d491be8bc9c62d88df6054d8739e51bef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043b808cbf61651f523bfaf436f10393d29e18eeec91e647e398ae444e6d01618a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a03eb5d116c80b124dec3672b93494383c20526b8cd272da617ea6d023013fec448881d4e71aba12cef4f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,8 +511,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd9fe1acd8a16ff7bd55d11fc9adff53c39e8dd09ba65656abd65a78ffe2e16e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0d2e439d37dddbb0c5421ddccea87851ea74d7a511856f9f42397351ff3b4c91",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
@@ -448,10 +562,10 @@
             }
         }
     },
-    "CallSha256_4_gas99_d0g0v0_Metropolis" : {
+    "CallSha256_4_gas99_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/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf179",
-                    "hash" : "0x7d2842ba037498af08352fc02d4105c66c87637d3e15639cdb0ccb04430d4ed2",
-                    "mixHash" : "0xda649f28cbaf3328c1aa0c0febc84f8ad5d092632fa2aee23c574317f8a0a824",
-                    "nonce" : "0xc2db07a236d1e179",
+                    "gasUsed" : "0x01508d",
+                    "hash" : "0xccc5e2577ce54fdb0b9b1225d23a0aa07bbefb96ee64b3ecb6238fdbda8a0b78",
+                    "mixHash" : "0x590bf42d37d9a48e57ec93c0a3ab92f4b9e04d140569ff4219b4ccffe66faedb",
+                    "nonce" : "0xc4e9049404dd9ba2",
                     "number" : "0x01",
                     "parentHash" : "0xef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1",
-                    "receiptTrie" : "0x4fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbf",
-                    "stateRoot" : "0xe9a7e55ac2f3ad672a5199b3c2d2f1201b51e1efeb162a92de57711d44a907a9",
+                    "receiptTrie" : "0xc37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4",
+                    "stateRoot" : "0x43b808cbf61651f523bfaf436f10393d29e18eeec91e647e398ae444e6d01618",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9a7e55ac2f3ad672a5199b3c2d2f1201b51e1efeb162a92de57711d44a907a9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba04fa2a763ccfd26598c5f12740346f13d07d54016f4293314d4e4480c9a32ccbfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1798203e880a0da649f28cbaf3328c1aa0c0febc84f8ad5d092632fa2aee23c574317f8a0a82488c2db07a236d1e179f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0ef46d7ae94230abb45fdaeb857b0949c3c2cf67297d261cae3311c7556b0f8f1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043b808cbf61651f523bfaf436f10393d29e18eeec91e647e398ae444e6d01618a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c37112e1b2bff11e7fc4603d7ec418b231f4569b468e295d4cd596aa0f5ee0f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301508d8203e880a0590bf42d37d9a48e57ec93c0a3ab92f4b9e04d140569ff4219b4ccffe66faedb88c4e9049404dd9ba2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -511,10 +625,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d15fa4fb01ddd44d4ddfb3c62ef9aeffe4428594a9d6a34cc1816732ac8b5caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d2842ba037498af08352fc02d4105c66c87637d3e15639cdb0ccb04430d4ed2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xccc5e2577ce54fdb0b9b1225d23a0aa07bbefb96ee64b3ecb6238fdbda8a0b78",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -531,14 +645,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f179",
+                "balance" : "0x4563918244f5508d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187e7",
+                "balance" : "0x0de0b6b3a76128d3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_5_d0g0v0.json
index e7c16b62c..238b1ba26 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallSha256_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallSha256_5_d0g0v0_EIP150" : {
+    "CallSha256_5_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/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fa360",
-                    "hash" : "0x3cc73263bbc4ddd71ef20b6889d6282acc354113e6a0ecc210a3132870526fe2",
-                    "mixHash" : "0x0c6212790f45d73ba42472e1819c9d245f3d2a9d4e734d0f883150a6696a8dc9",
-                    "nonce" : "0xc85c6e54cc8bd1e7",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0x189bd169ffa78c299271d628f6f86d7bb65c1240ccf6aa91e2d102e0a70d2650",
+                    "mixHash" : "0xf5fb9f88f37e3ea48d0bc9cb651aa2f576255b52e798c47cab31e34c7aa74746",
+                    "nonce" : "0xa8b7786d154f16b7",
                     "number" : "0x01",
                     "parentHash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
-                    "receiptTrie" : "0x94e0efa99bab82df1dfba46339f56270974e8c3d8768c09c25cb0dbf81f1a4b0",
-                    "stateRoot" : "0x84bb29be3788146df34bb80ed55276a10d75388108e4d29daa3d2f4edf9e278e",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0x9122260505b9ef1b1de87f755a1f343801a79650704364fa071aa269fa551a7d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084bb29be3788146df34bb80ed55276a10d75388108e4d29daa3d2f4edf9e278ea0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a094e0efa99bab82df1dfba46339f56270974e8c3d8768c09c25cb0dbf81f1a4b0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa3608203e880a00c6212790f45d73ba42472e1819c9d245f3d2a9d4e734d0f883150a6696a8dc988c85c6e54cc8bd1e7f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09122260505b9ef1b1de87f755a1f343801a79650704364fa071aa269fa551a7da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0f5fb9f88f37e3ea48d0bc9cb651aa2f576255b52e798c47cab31e34c7aa7474688a8b7786d154f16b7f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3cc73263bbc4ddd71ef20b6889d6282acc354113e6a0ecc210a3132870526fe2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x189bd169ffa78c299271d628f6f86d7bb65c1240ccf6aa91e2d102e0a70d2650",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513a360",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742d600",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CallSha256_5_d0g0v0_EIP158" : {
+    "CallSha256_5_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/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0x415c93fe5ae82675603e8fd7c87ee943bd2dad0d16a25c3fde4161dbfe5a1032",
-                    "mixHash" : "0x6c19b2c90192fe49cd0268eed6c125c573373bcc88aee73148443f0751aba00c",
-                    "nonce" : "0x3364f55dad93bb7e",
+                    "hash" : "0xf2a9586ca29a1c36055388ee840e21df0c921b1de1620cd44370b83ae24e5d05",
+                    "mixHash" : "0x42a32e099e3fa4b502ea02cd7362d1cdcab6e5ff409af9a250cb07111ccc66b9",
+                    "nonce" : "0x427304c6b72154ec",
                     "number" : "0x01",
                     "parentHash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
-                    "receiptTrie" : "0x30a8cd28695cb29588e17f2293b7199ff9247c1d5810a284c31962f335d6123f",
-                    "stateRoot" : "0x1713d43a784ead961d2b0630a44c0a0be3e1e7fb475e73578bfb26139df8b843",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0x9122260505b9ef1b1de87f755a1f343801a79650704364fa071aa269fa551a7d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01713d43a784ead961d2b0630a44c0a0be3e1e7fb475e73578bfb26139df8b843a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a030a8cd28695cb29588e17f2293b7199ff9247c1d5810a284c31962f335d6123fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a06c19b2c90192fe49cd0268eed6c125c573373bcc88aee73148443f0751aba00c883364f55dad93bb7ef865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09122260505b9ef1b1de87f755a1f343801a79650704364fa071aa269fa551a7da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a042a32e099e3fa4b502ea02cd7362d1cdcab6e5ff409af9a250cb07111ccc66b988427304c6b72154ecf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x415c93fe5ae82675603e8fd7c87ee943bd2dad0d16a25c3fde4161dbfe5a1032",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf2a9586ca29a1c36055388ee840e21df0c921b1de1620cd44370b83ae24e5d05",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "CallSha256_5_d0g0v0_Frontier" : {
+    "CallSha256_5_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/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fa0cc",
-                    "hash" : "0x95a6cd09228edefeac05d3fc58e4ffdbc1ab7e196715ec9cbeed51af726b7d91",
-                    "mixHash" : "0x852eeaabd85cb4196a7636ad97bec970a5d26a0e4946fe469c2cb966530b8007",
-                    "nonce" : "0x582ccbe4ed85576d",
+                    "gasUsed" : "0x1fa360",
+                    "hash" : "0x365fccace9b150548b209aafd1234b5b43c511207f9fa96535f625b6a888496b",
+                    "mixHash" : "0xd0ce52f57c1118c6945ba52c0843909013c62ff9c8f3a22eec70034cff0ce20c",
+                    "nonce" : "0x8fadcc42394c5574",
                     "number" : "0x01",
                     "parentHash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
-                    "receiptTrie" : "0x5281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfed",
-                    "stateRoot" : "0x8c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85",
+                    "receiptTrie" : "0x94e0efa99bab82df1dfba46339f56270974e8c3d8768c09c25cb0dbf81f1a4b0",
+                    "stateRoot" : "0x84bb29be3788146df34bb80ed55276a10d75388108e4d29daa3d2f4edf9e278e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a05281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a0852eeaabd85cb4196a7636ad97bec970a5d26a0e4946fe469c2cb966530b800788582ccbe4ed85576df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084bb29be3788146df34bb80ed55276a10d75388108e4d29daa3d2f4edf9e278ea0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a094e0efa99bab82df1dfba46339f56270974e8c3d8768c09c25cb0dbf81f1a4b0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa3608203e880a0d0ce52f57c1118c6945ba52c0843909013c62ff9c8f3a22eec70034cff0ce20c888fadcc42394c5574f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95a6cd09228edefeac05d3fc58e4ffdbc1ab7e196715ec9cbeed51af726b7d91",
-        "network" : "Frontier",
+        "lastblockhash" : "0x365fccace9b150548b209aafd1234b5b43c511207f9fa96535f625b6a888496b",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513a0cc",
+                "balance" : "0x456391824513a360",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742d894",
+                "balance" : "0x0de0b6b3a742d600",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "CallSha256_5_d0g0v0_Homestead" : {
+    "CallSha256_5_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/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1fa0cc",
-                    "hash" : "0xdbef749401969ba7a385ba60cd289b0e718f3be50fa31b55a4f13088ab141203",
-                    "mixHash" : "0x2a1ac03616d80f6aadd1c4596972346b77e17e16c40ed467afe13c629fc01343",
-                    "nonce" : "0xb66c99f60ac00a76",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0xfee9ca4c634fcf5ffcca23d25b935bd6b70b81cd1858a1d569a356c3dc08a2ca",
+                    "mixHash" : "0x57123a65cc6d8b295f0ddf4c4bfa32540ed59ca2415cd7790d15f4ab0526d387",
+                    "nonce" : "0x2ecd23def7922285",
                     "number" : "0x01",
                     "parentHash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
-                    "receiptTrie" : "0x5281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfed",
-                    "stateRoot" : "0x8c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85",
+                    "receiptTrie" : "0x30a8cd28695cb29588e17f2293b7199ff9247c1d5810a284c31962f335d6123f",
+                    "stateRoot" : "0x1713d43a784ead961d2b0630a44c0a0be3e1e7fb475e73578bfb26139df8b843",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a05281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a02a1ac03616d80f6aadd1c4596972346b77e17e16c40ed467afe13c629fc0134388b66c99f60ac00a76f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01713d43a784ead961d2b0630a44c0a0be3e1e7fb475e73578bfb26139df8b843a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a030a8cd28695cb29588e17f2293b7199ff9247c1d5810a284c31962f335d6123fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a057123a65cc6d8b295f0ddf4c4bfa32540ed59ca2415cd7790d15f4ab0526d387882ecd23def7922285f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbef749401969ba7a385ba60cd289b0e718f3be50fa31b55a4f13088ab141203",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfee9ca4c634fcf5ffcca23d25b935bd6b70b81cd1858a1d569a356c3dc08a2ca",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824513a0cc",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a742d894",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "CallSha256_5_d0g0v0_Metropolis" : {
+    "CallSha256_5_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/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f41b8",
-                    "hash" : "0x6be36a956680e2ef02334f30587ab9a77235b809c2d9595e856820388065968c",
-                    "mixHash" : "0x26dcec553e769510007b75d14ea4f8a774e14eebd3a57a6e46dd4199ef1ab823",
-                    "nonce" : "0xa70396a5d2d23924",
+                    "gasUsed" : "0x1fa0cc",
+                    "hash" : "0x337fdd4e463150b2b54fdd0d579b30830a65e2a8af15f926f54d1e49ed399d9e",
+                    "mixHash" : "0x7e91b4c5f7d8b8175631aeeae6bc040d390a2f5e2f07815c7e6433b226664186",
+                    "nonce" : "0x232958a6109657c3",
                     "number" : "0x01",
                     "parentHash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
-                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
-                    "stateRoot" : "0x9122260505b9ef1b1de87f755a1f343801a79650704364fa071aa269fa551a7d",
+                    "receiptTrie" : "0x5281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfed",
+                    "stateRoot" : "0x8c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09122260505b9ef1b1de87f755a1f343801a79650704364fa071aa269fa551a7da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a026dcec553e769510007b75d14ea4f8a774e14eebd3a57a6e46dd4199ef1ab82388a70396a5d2d23924f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a05281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a07e91b4c5f7d8b8175631aeeae6bc040d390a2f5e2f07815c7e6433b22666418688232958a6109657c3f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6be36a956680e2ef02334f30587ab9a77235b809c2d9595e856820388065968c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x337fdd4e463150b2b54fdd0d579b30830a65e2a8af15f926f54d1e49ed399d9e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824513a0cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a742d894",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallSha256_5_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1fa0cc",
+                    "hash" : "0x3cf0f81d9edad9c40ba3cc552214aff80e08393ffca29f5039ecb9d8084923b2",
+                    "mixHash" : "0xf1bdab448f7f5cf767bd42d8e4f0c443078a84da3f73855216cea51a91c83013",
+                    "nonce" : "0xfe710c4df53f7ee2",
+                    "number" : "0x01",
+                    "parentHash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
+                    "receiptTrie" : "0x5281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfed",
+                    "stateRoot" : "0x8c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c6caad2fab6c203f0082136c9e8b3ede9cee90e463b4b75473025561689fb85a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a05281f6ac42edefe0ff40d7cb867af5002b2890ec7ebf41efd9e88fc4c926bfedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831fa0cc8203e880a0f1bdab448f7f5cf767bd42d8e4f0c443078a84da3f73855216cea51a91c8301388fe710c4df53f7ee2f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x403597d689594ff7c3e6093ec8c2db8c835cf30fe0607a4355616cca77708d45",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9458df4f05aba0961fe45bf52b68d1ba4679b831fc59410cba5f43207c8cf99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3cf0f81d9edad9c40ba3cc552214aff80e08393ffca29f5039ecb9d8084923b2",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451341b8",
+                "balance" : "0x456391824513a0cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a74337a8",
+                "balance" : "0x0de0b6b3a742d894",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json
index 40345061f..fcfd623a6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_0_0_1000000_d0g0v0_EIP150" : {
+    "modexp_0_0_0_1000000_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/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x4647a87772a880834efb02ff785263c3c16c65f1c6df4f555cab254f1bd62fe9",
-                    "mixHash" : "0x63603e2f74045ddfcb934553e6f8047271baefca522fac32270e7ff3ee56a7e6",
-                    "nonce" : "0xf3fedbb8116fe4bd",
+                    "hash" : "0x1565f5cf3b98350304a3841267a4f03468023aef8ae6def8658d719d27ef8a71",
+                    "mixHash" : "0x9b2908c1ba3760216af594411ddba3eb1231cc4a3649ecdb81c477ba10cdf7d6",
+                    "nonce" : "0x4348c6f0ffa5b4aa",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
-                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a063603e2f74045ddfcb934553e6f8047271baefca522fac32270e7ff3ee56a7e688f3fedbb8116fe4bdf90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a09b2908c1ba3760216af594411ddba3eb1231cc4a3649ecdb81c477ba10cdf7d6884348c6f0ffa5b4aaf90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4647a87772a880834efb02ff785263c3c16c65f1c6df4f555cab254f1bd62fe9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1565f5cf3b98350304a3841267a4f03468023aef8ae6def8658d719d27ef8a71",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ad7c",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_0_0_1000000_d0g0v0_EIP158" : {
+    "modexp_0_0_0_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x77fd2d634562c60e22207aabd6caf61ff0c1b69f047f394adac98f4758ae905e",
+                    "mixHash" : "0x23fb616453fba3c2712e64796ea74250a5b030cc08f4ad87475f8a725b600a85",
+                    "nonce" : "0xdaee388846739093",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a023fb616453fba3c2712e64796ea74250a5b030cc08f4ad87475f8a725b600a8588daee388846739093f90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9858",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6",
+                        "s" : "0x7780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x77fd2d634562c60e22207aabd6caf61ff0c1b69f047f394adac98f4758ae905e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ad7c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615284",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_0_0_1000000_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/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0xb3e6bcaa44a431ca0294accfb676ae5faf3270700ab86fed9b2767974b0a39eb",
-                    "mixHash" : "0x1b4ca2464f3536551e53ad93f2d51ac1719012f3e19fef1555ef71e64211a1c5",
-                    "nonce" : "0xc03279888f12a851",
+                    "hash" : "0x4b27701ecde9927e1942049b41002d8ccc8c258fbc16ff026067176f4b2f9419",
+                    "mixHash" : "0x74b2900c7718cbb73b0d731cda5db31072043c7557d0fda1219217833bda0136",
+                    "nonce" : "0xa503e8a9ba3ee4bb",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a01b4ca2464f3536551e53ad93f2d51ac1719012f3e19fef1555ef71e64211a1c588c03279888f12a851f90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a074b2900c7718cbb73b0d731cda5db31072043c7557d0fda1219217833bda013688a503e8a9ba3ee4bbf90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3e6bcaa44a431ca0294accfb676ae5faf3270700ab86fed9b2767974b0a39eb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4b27701ecde9927e1942049b41002d8ccc8c258fbc16ff026067176f4b2f9419",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_0_0_1000000_d0g0v0_Frontier" : {
+    "modexp_0_0_0_1000000_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/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9858",
-                    "hash" : "0xeabaf2b5284de539d1b3c368b8f5797e43ee48a14aafebd9ecfba04b0760481e",
-                    "mixHash" : "0x23a13dcbd00aac986bd4023544d5cf46c7d98fb0b02732625344a068a9cf47dd",
-                    "nonce" : "0x230209a6a62a9cea",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x2bb7c27aa2411840a1837d06a3f1ca07aca73bf7c9efe46a172220982794e3eb",
+                    "mixHash" : "0x59623c50ee5a2428717161122f9199d502cb0ad808ee2bd1aa81842b4d5a928c",
+                    "nonce" : "0x02ad00cb5fa75f0f",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xbf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97c",
-                    "stateRoot" : "0x1c24993bebdf8f924e8a06d3cd07d3cab1f4ef88c78661306a6322ce02f4d6ba",
+                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
+                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c24993bebdf8f924e8a06d3cd07d3cab1f4ef88c78661306a6322ce02f4d6baa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0bf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f98588203e880a023a13dcbd00aac986bd4023544d5cf46c7d98fb0b02732625344a068a9cf47dd88230209a6a62a9ceaf90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a059623c50ee5a2428717161122f9199d502cb0ad808ee2bd1aa81842b4d5a928c8802ad00cb5fa75f0ff90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeabaf2b5284de539d1b3c368b8f5797e43ee48a14aafebd9ecfba04b0760481e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2bb7c27aa2411840a1837d06a3f1ca07aca73bf7c9efe46a172220982794e3eb",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059a46",
+                "balance" : "0x4563918244f6ad7c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75265ba",
+                "balance" : "0x0de0b6b3a7615284",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_0_0_1000000_d0g0v0_Homestead" : {
+    "modexp_0_0_0_1000000_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/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9858",
-                    "hash" : "0x1868bb7ebe9c99fe2c6adbb09d45556aced7e308f876749b8f8ce6f5df533c22",
-                    "mixHash" : "0x9d5dbcaa4f6a0241b725e1b0a4983889dfe8e06b853428ef8ecf8e861e66e3c0",
-                    "nonce" : "0x60cce7570e1a3771",
+                    "hash" : "0x3bbd20c0a4cecf0d5962327c8a81692fb9ec81c6de7c495b0b2d1a860d38f963",
+                    "mixHash" : "0x7c4ff8f64feae08fff1fc189eb2f825c3c1587dfb87f6da1cfe4ce460e9ddf84",
+                    "nonce" : "0xc30007131ba3fe6b",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0xbf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97c",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c24993bebdf8f924e8a06d3cd07d3cab1f4ef88c78661306a6322ce02f4d6baa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0bf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f98588203e880a09d5dbcaa4f6a0241b725e1b0a4983889dfe8e06b853428ef8ecf8e861e66e3c08860cce7570e1a3771f90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c24993bebdf8f924e8a06d3cd07d3cab1f4ef88c78661306a6322ce02f4d6baa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0bf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f98588203e880a07c4ff8f64feae08fff1fc189eb2f825c3c1587dfb87f6da1cfe4ce460e9ddf8488c30007131ba3fe6bf90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1868bb7ebe9c99fe2c6adbb09d45556aced7e308f876749b8f8ce6f5df533c22",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3bbd20c0a4cecf0d5962327c8a81692fb9ec81c6de7c495b0b2d1a860d38f963",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_0_0_1000000_d0g0v0_Metropolis" : {
+    "modexp_0_0_0_1000000_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/stPreCompiledContracts/modexp_0_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xab8e",
-                    "hash" : "0xf20209263ff6b4c4a40fe4b1e8a12c1e41db18a564c7bea0127e93d14014bcb2",
-                    "mixHash" : "0xeeee8916b384ae480f877a4e76dbd66b287630568b2ca4cd1bcb259216d24659",
-                    "nonce" : "0x9ff26f32cdcbc124",
+                    "gasUsed" : "0x0f9858",
+                    "hash" : "0x5551d3bd8e65b6e355b17f0cd587d0278c18be937d649622c42ac249ece0c241",
+                    "mixHash" : "0x134bf448709273677ca5c2808e49c00cb8d378c58d34a57aef919340fd5a441a",
+                    "nonce" : "0x1f723ed9cfd1ecaf",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
-                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "receiptTrie" : "0xbf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97c",
+                    "stateRoot" : "0x1c24993bebdf8f924e8a06d3cd07d3cab1f4ef88c78661306a6322ce02f4d6ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x53c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0eeee8916b384ae480f877a4e76dbd66b287630568b2ca4cd1bcb259216d24659889ff26f32cdcbc124f90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
+                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c24993bebdf8f924e8a06d3cd07d3cab1f4ef88c78661306a6322ce02f4d6baa053c0bd542b980c97665e76ec776b51551f3c9e138f7355641aa6fa724cfba92ba0bf7e2c21c8f95837600fecda9b30610c467b07c57a73a7b0a2aa57d583f2a97cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f98588203e880a0134bf448709273677ca5c2808e49c00cb8d378c58d34a57aef919340fd5a441a881f723ed9cfd1ecaff90108f901050101830f985894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba03831dc03327e9eb2f3a8b931a0e29e593d69c4658a9df10b5796918fffcd65e6a07780198113195ce73fa48c946a5abf530efc840e7a69a63ea7307c3a90f81387c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf20209263ff6b4c4a40fe4b1e8a12c1e41db18a564c7bea0127e93d14014bcb2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5551d3bd8e65b6e355b17f0cd587d0278c18be937d649622c42ac249ece0c241",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ad7c",
+                "balance" : "0x4563918245059a46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615284",
+                "balance" : "0x0de0b6b3a75265ba",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json
index e70e8a2be..9e25fa2cd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_0_0_155000_d0g0v0_EIP150" : {
+    "modexp_0_0_0_155000_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/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0xaced6cc976d99079165b6ca0dc4009ee97f45d0a25ee2ea76e8d4e649ece9971",
-                    "mixHash" : "0xa6841d211e775fd1b52c05fb780d3b6b8d2e122834c92c02c5eefd84bfdc53d9",
-                    "nonce" : "0x684562c6a4ee033f",
+                    "hash" : "0xd94a6c2933573966bd5a31fd635b2c626ce5f7579df9ad3b041638de0f68bb0b",
+                    "mixHash" : "0x8e8f3ccc128ca33ffc5af3b016801fa27bff328031c1656ee8a06ef1e57f6c17",
+                    "nonce" : "0xef5d469c855d896c",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
-                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0a6841d211e775fd1b52c05fb780d3b6b8d2e122834c92c02c5eefd84bfdc53d988684562c6a4ee033ff90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a08e8f3ccc128ca33ffc5af3b016801fa27bff328031c1656ee8a06ef1e57f6c1788ef5d469c855d896cf90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaced6cc976d99079165b6ca0dc4009ee97f45d0a25ee2ea76e8d4e649ece9971",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd94a6c2933573966bd5a31fd635b2c626ce5f7579df9ad3b041638de0f68bb0b",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ad7c",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_0_0_155000_d0g0v0_EIP158" : {
+    "modexp_0_0_0_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x83dbec181d08bfe2dd28b336555c0be7a0c7d9aafd804481c5973ec10e72bafe",
+                    "mixHash" : "0x2545bfac8c2af90fe83851cf7e806b90a4db9e1fb56399a85ea6ea251ff9ad01",
+                    "nonce" : "0x6008994527bb47e7",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a02545bfac8c2af90fe83851cf7e806b90a4db9e1fb56399a85ea6ea251ff9ad01886008994527bb47e7f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b390",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xfcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231",
+                        "s" : "0x578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x83dbec181d08bfe2dd28b336555c0be7a0c7d9aafd804481c5973ec10e72bafe",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ad7c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615284",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_0_0_155000_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/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x7786ed849d2870d135c3bd977f119d81e219368c87164bcacaff00f4ad82f042",
-                    "mixHash" : "0xd9e26fe89dde4150c795b65eb2f2c6302f097861ac92b4849f3bddd35c6931e6",
-                    "nonce" : "0xa2841e7d959c9ce3",
+                    "hash" : "0x2561d721a07b08db7b7f0cf89006e67bb8e4632fd068ef408b6c7466acef92d0",
+                    "mixHash" : "0x961fe68f5dd09b83a4e22f37e32266aa658d34408c4f54e045feb933b50ba168",
+                    "nonce" : "0x3c579bdac4801bf1",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0d9e26fe89dde4150c795b65eb2f2c6302f097861ac92b4849f3bddd35c6931e688a2841e7d959c9ce3f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0961fe68f5dd09b83a4e22f37e32266aa658d34408c4f54e045feb933b50ba168883c579bdac4801bf1f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7786ed849d2870d135c3bd977f119d81e219368c87164bcacaff00f4ad82f042",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2561d721a07b08db7b7f0cf89006e67bb8e4632fd068ef408b6c7466acef92d0",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_0_0_155000_d0g0v0_Frontier" : {
+    "modexp_0_0_0_155000_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/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b390",
-                    "hash" : "0x086f29833c5019b78cf703bafcccf766b980a4264ca6388114137ddd960b3c0f",
-                    "mixHash" : "0x0200895d353b5aeda80864304f5fc8694f5721d3f12c92a6ac30bce4160ab11d",
-                    "nonce" : "0x9d4d2a66f69d3426",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x7ba9173c0390bc66f3f94fb557132be913e81d60c1085951961791c064970dc6",
+                    "mixHash" : "0x2db7df96646019bc7861a48aa508789a92f5307598313f8239d96ca4d89d1677",
+                    "nonce" : "0xd2ee5cce52d9b40b",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x22c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ec",
-                    "stateRoot" : "0xb2c65f41733b8b0c668e852b808561787e15ea6d7f5bd85e38c36342e6375bf5",
+                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
+                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2c65f41733b8b0c668e852b808561787e15ea6d7f5bd85e38c36342e6375bf5a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a022c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b3908203e880a00200895d353b5aeda80864304f5fc8694f5721d3f12c92a6ac30bce4160ab11d889d4d2a66f69d3426f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a02db7df96646019bc7861a48aa508789a92f5307598313f8239d96ca4d89d167788d2ee5cce52d9b40bf90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x086f29833c5019b78cf703bafcccf766b980a4264ca6388114137ddd960b3c0f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7ba9173c0390bc66f3f94fb557132be913e81d60c1085951961791c064970dc6",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b57e",
+                "balance" : "0x4563918244f6ad7c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4a82",
+                "balance" : "0x0de0b6b3a7615284",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_0_0_155000_d0g0v0_Homestead" : {
+    "modexp_0_0_0_155000_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/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b390",
-                    "hash" : "0x084f37c27e57d1e4921a746466f02b89051890ef5c4b835e93a5e6d50aa4f23d",
-                    "mixHash" : "0x429b359ffd09eff35342484d3934cfe62ffc6b774d0c4cc4f8faae46119bde2e",
-                    "nonce" : "0x68b3db9b1b40b56a",
+                    "hash" : "0xebcd90e76cb0eeb0856a91cae02ba24e18424f190878459d557a42dbfbea0f9e",
+                    "mixHash" : "0xbefcfb0d785ab822e85f13bf6c3945b8b5484856d6ab89b9213b3ec0a3cb62a2",
+                    "nonce" : "0xab6297871a10e70e",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x22c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ec",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2c65f41733b8b0c668e852b808561787e15ea6d7f5bd85e38c36342e6375bf5a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a022c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b3908203e880a0429b359ffd09eff35342484d3934cfe62ffc6b774d0c4cc4f8faae46119bde2e8868b3db9b1b40b56af90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2c65f41733b8b0c668e852b808561787e15ea6d7f5bd85e38c36342e6375bf5a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a022c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b3908203e880a0befcfb0d785ab822e85f13bf6c3945b8b5484856d6ab89b9213b3ec0a3cb62a288ab6297871a10e70ef90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x084f37c27e57d1e4921a746466f02b89051890ef5c4b835e93a5e6d50aa4f23d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xebcd90e76cb0eeb0856a91cae02ba24e18424f190878459d557a42dbfbea0f9e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_0_0_155000_d0g0v0_Metropolis" : {
+    "modexp_0_0_0_155000_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/stPreCompiledContracts/modexp_0_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xab8e",
-                    "hash" : "0xe3b48f24a34102c49d7ed927f99afa74e9cd82255c2ee9118b96b73645b36759",
-                    "mixHash" : "0xf9fbdd56f6aee0d47ca59592afa30b2afbc1b175c1afdb4478389fbf74f04d37",
-                    "nonce" : "0xdfe0e4498368d0f6",
+                    "gasUsed" : "0x02b390",
+                    "hash" : "0x85ae70713d64f818100216b158650d9d58bbed513665813981b337c1cd52c5a6",
+                    "mixHash" : "0xe017483e460647d67f9952bc11856b06f52a6feeb9e09fd934d1f48c8be5b085",
+                    "nonce" : "0x49a534416be84fe9",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
-                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "receiptTrie" : "0x22c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ec",
+                    "stateRoot" : "0xb2c65f41733b8b0c668e852b808561787e15ea6d7f5bd85e38c36342e6375bf5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0f9fbdd56f6aee0d47ca59592afa30b2afbc1b175c1afdb4478389fbf74f04d3788dfe0e4498368d0f6f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
+                "rlp" : "0xf90308f901f9a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2c65f41733b8b0c668e852b808561787e15ea6d7f5bd85e38c36342e6375bf5a04bd9e4884c93b99ea493f67a066913e0e4e86e2f57f57d1337dfd6ea7b910489a022c7983074944cd76244ac752cae7e7097e5dc5e69afd03edbe20ad569e6a5ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b3908203e880a0e017483e460647d67f9952bc11856b06f52a6feeb9e09fd934d1f48c8be5b0858849a534416be84fe9f90108f9010501018302b39094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0fcdda36f6a1936963ad6203c8d108dd7e641b26920d2a3e1bc68e9f6a5ec8231a0578ed176840b0d479723661935128e3623fc8b5489b9c130414f075f34862da3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3b48f24a34102c49d7ed927f99afa74e9cd82255c2ee9118b96b73645b36759",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x85ae70713d64f818100216b158650d9d58bbed513665813981b337c1cd52c5a6",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ad7c",
+                "balance" : "0x4563918244f8b57e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615284",
+                "balance" : "0x0de0b6b3a75f4a82",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0.json
index 3ccd483b8..708233bdd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_0_0_20500_d0g0v0_EIP150" : {
+    "modexp_0_0_0_20500_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/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa62c",
-                    "hash" : "0xb74544935be0c21f23be35d377e63f77b13f02ee87877c7a99fa005f5d5b9327",
-                    "mixHash" : "0x5df64d28689739e02fe5865bf14f86a46e9d455875d7f0715c4ca96da5e50426",
-                    "nonce" : "0x6e0634aab0ef54a1",
+                    "hash" : "0xe1d5aa5c8467bba1ae3876d97c85d978af5a2f9dfea4f30f851845684350a0df",
+                    "mixHash" : "0x4b17a8368602f65a4eba2a1103e9cf94556660d6baa3125a2b57780d7b8400db",
+                    "nonce" : "0xf5ca8a7b936743c8",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9c",
-                    "stateRoot" : "0x32798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560",
+                    "receiptTrie" : "0x37cfb689d2e7d613226d1f60384f76c0b49d22bbc1de881b8ef19f48319e5596",
+                    "stateRoot" : "0x1f068bdd4b207cd2eaaa1fe3d27821a8376a58d0488586dfafa4f156bca5bac5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a05df64d28689739e02fe5865bf14f86a46e9d455875d7f0715c4ca96da5e50426886e0634aab0ef54a1f90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01f068bdd4b207cd2eaaa1fe3d27821a8376a58d0488586dfafa4f156bca5bac5a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a037cfb689d2e7d613226d1f60384f76c0b49d22bbc1de881b8ef19f48319e5596b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a04b17a8368602f65a4eba2a1103e9cf94556660d6baa3125a2b57780d7b8400db88f5ca8a7b936743c8f90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb74544935be0c21f23be35d377e63f77b13f02ee87877c7a99fa005f5d5b9327",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe1d5aa5c8467bba1ae3876d97c85d978af5a2f9dfea4f30f851845684350a0df",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a81a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_0_0_0_20500_d0g0v0_EIP158" : {
+    "modexp_0_0_0_20500_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/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa62c",
-                    "hash" : "0xfabc9932e8a8d9b825a4dccc7993dcac9ffbe9ca6094d67092e07c77906eb3c8",
-                    "mixHash" : "0x05399bef4172d650746d000478c39fceb6bb8769c2318eb4a502c1b3b712ac83",
-                    "nonce" : "0x685fd93dbb103573",
+                    "hash" : "0x132cf50be909f7ab945633526dd824e26bd9f96ce381620c9a6c503fee8d3679",
+                    "mixHash" : "0xd924d74098e3ea1995ecd2cd46264b0b80402804a561382920d49d260e42b7e5",
+                    "nonce" : "0x7147d7d2394902ce",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9c",
-                    "stateRoot" : "0x32798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560",
+                    "receiptTrie" : "0x37cfb689d2e7d613226d1f60384f76c0b49d22bbc1de881b8ef19f48319e5596",
+                    "stateRoot" : "0x1f068bdd4b207cd2eaaa1fe3d27821a8376a58d0488586dfafa4f156bca5bac5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a005399bef4172d650746d000478c39fceb6bb8769c2318eb4a502c1b3b712ac8388685fd93dbb103573f90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01f068bdd4b207cd2eaaa1fe3d27821a8376a58d0488586dfafa4f156bca5bac5a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a037cfb689d2e7d613226d1f60384f76c0b49d22bbc1de881b8ef19f48319e5596b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a0d924d74098e3ea1995ecd2cd46264b0b80402804a561382920d49d260e42b7e5887147d7d2394902cef90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfabc9932e8a8d9b825a4dccc7993dcac9ffbe9ca6094d67092e07c77906eb3c8",
-        "network" : "EIP158",
+        "lastblockhash" : "0x132cf50be909f7ab945633526dd824e26bd9f96ce381620c9a6c503fee8d3679",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a81a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_0_0_0_20500_d0g0v0_Frontier" : {
+    "modexp_0_0_0_20500_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/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa62c",
-                    "hash" : "0x83e39ec9924df494a1f9e722ee36d1c1ec932c04691adf8c859d8adc9252d2e8",
-                    "mixHash" : "0x440977f44577ee5efb6748582e2358a58e6b73fc82a34ef7914a487cd15ff75b",
-                    "nonce" : "0x2be559b707083e7e",
+                    "hash" : "0xe8e7ea305968359fc702cef33d1dcba3f6ee00a27e0aa8fa8dfc02d5bdab77a3",
+                    "mixHash" : "0x57a20b9436ef1a5f29cdb74847a938c7131da5ad7773a888480a0ae90d693daf",
+                    "nonce" : "0x6896fddd988e18f8",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9c",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x0df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a0440977f44577ee5efb6748582e2358a58e6b73fc82a34ef7914a487cd15ff75b882be559b707083e7ef90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a057a20b9436ef1a5f29cdb74847a938c7131da5ad7773a888480a0ae90d693daf886896fddd988e18f8f90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83e39ec9924df494a1f9e722ee36d1c1ec932c04691adf8c859d8adc9252d2e8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe8e7ea305968359fc702cef33d1dcba3f6ee00a27e0aa8fa8dfc02d5bdab77a3",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_0_0_0_20500_d0g0v0_Homestead" : {
+    "modexp_0_0_0_20500_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/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa62c",
-                    "hash" : "0xcfc73bf6869ff3c067f7fdaa045a149a7f3774e9641110ba481accb9b526d5e5",
-                    "mixHash" : "0x3f48f2ca6eb5aadf2056e12eeefcbfadbd55439746e3ed6799d146d1ab5a29cc",
-                    "nonce" : "0x344fdcbe8e5cf53f",
+                    "hash" : "0x7578eddc0981e2e8d4bcef1362e484fe5dbd5de966cd00e07b7e7c2b70b077b6",
+                    "mixHash" : "0xe72482a190b92aba6c308d94f0ec43e7d306a298c01232cb7ad6c7ac1e996307",
+                    "nonce" : "0x4544562b6356c740",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9c",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x0df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a03f48f2ca6eb5aadf2056e12eeefcbfadbd55439746e3ed6799d146d1ab5a29cc88344fdcbe8e5cf53ff90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a0e72482a190b92aba6c308d94f0ec43e7d306a298c01232cb7ad6c7ac1e996307884544562b6356c740f90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfc73bf6869ff3c067f7fdaa045a149a7f3774e9641110ba481accb9b526d5e5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7578eddc0981e2e8d4bcef1362e484fe5dbd5de966cd00e07b7e7c2b70b077b6",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_0_0_0_20500_d0g0v0_Metropolis" : {
+    "modexp_0_0_0_20500_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/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa62c",
-                    "hash" : "0x1ac316cb9e68d96a6c4517892b2f60f3ccf74e0439da2d93971173bb5007fdcf",
-                    "mixHash" : "0x658db8c3da355e3a62e46e2dde019bd209952a975b0572a373b5251910a2e57b",
-                    "nonce" : "0xbc744435a627d75d",
+                    "hash" : "0x3b57bea35005d457caf490aa0e3ec92f92becb52e21a7d816acfcb38942db6fb",
+                    "mixHash" : "0x4db5bca04759c0f19316d6c71cadb2e6a308b779f834f05f374322e553892977",
+                    "nonce" : "0xa3a850e7d44a4c16",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x37cfb689d2e7d613226d1f60384f76c0b49d22bbc1de881b8ef19f48319e5596",
-                    "stateRoot" : "0x1f068bdd4b207cd2eaaa1fe3d27821a8376a58d0488586dfafa4f156bca5bac5",
+                    "receiptTrie" : "0x693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9c",
+                    "stateRoot" : "0x32798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01f068bdd4b207cd2eaaa1fe3d27821a8376a58d0488586dfafa4f156bca5bac5a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a037cfb689d2e7d613226d1f60384f76c0b49d22bbc1de881b8ef19f48319e5596b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a0658db8c3da355e3a62e46e2dde019bd209952a975b0572a373b5251910a2e57b88bc744435a627d75df90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a04db5bca04759c0f19316d6c71cadb2e6a308b779f834f05f374322e55389297788a3a850e7d44a4c16f90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ac316cb9e68d96a6c4517892b2f60f3ccf74e0439da2d93971173bb5007fdcf",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3b57bea35005d457caf490aa0e3ec92f92becb52e21a7d816acfcb38942db6fb",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6a81a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76157e6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_0_0_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa62c",
+                    "hash" : "0x04efb71ec030bea299ba8cb16376bbe1ff047bea2ac4a8a4fbf41e494ffcca04",
+                    "mixHash" : "0x202afc6c6e536ecca36a6e58f5a3c764f9e732ec004a232541d0e7ec2153adec",
+                    "nonce" : "0x21bb130d43afb93e",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0x693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9c",
+                    "stateRoot" : "0x32798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a032798f1911375bc6b6153df3b65e9bdb9089d345010a4d2c7cd06136922cd560a00df4db100581077ef71da3d6b653b11004240c4f557c4d5fa25c933e7f04ffb9a0693d4e68bd9d1f94e6608ceb2afdc1a211bad9f19921271d302c736f33e7ce9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a62c8203e880a0202afc6c6e536ecca36a6e58f5a3c764f9e732ec004a232541d0e7ec2153adec8821bb130d43afb93ef90107f90104010182a62c94c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca07c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cca009bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa62c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7c46c77517be09574d0711277e47720e2540442e889b6e1d30ac96b0709fb0cc",
+                        "s" : "0x09bb6e1dffd423465ff22bf8fb98b85de05b2ba75ef4b7c840148e1ab408c50a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x04efb71ec030bea299ba8cb16376bbe1ff047bea2ac4a8a4fbf41e494ffcca04",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0.json
index 600cd637c..6558ca435 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_0_0_22000_d0g0v0_EIP150" : {
+    "modexp_0_0_0_22000_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/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x7d3f43a0023e66eb670e34a74c8a721e1d3e9684f6ca170b382cf84ff881abaa",
-                    "mixHash" : "0xa37fc7eb84393d518c5112538dba1056f7c97f1e919ccb5a6557f992346a2b71",
-                    "nonce" : "0xdc85c3025f78fd29",
+                    "hash" : "0xe7e622bc155bf14347904f6009b50e5346ab0dc8c2d47e8ebec05fadc6aee692",
+                    "mixHash" : "0x4323656d04eeeb74234f9a5f958320f8dc1796c03c6b29ae087dc0e1a027f035",
+                    "nonce" : "0xb4686410e8f8b3f2",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
-                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0a37fc7eb84393d518c5112538dba1056f7c97f1e919ccb5a6557f992346a2b7188dc85c3025f78fd29f90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a04323656d04eeeb74234f9a5f958320f8dc1796c03c6b29ae087dc0e1a027f03588b4686410e8f8b3f2f90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d3f43a0023e66eb670e34a74c8a721e1d3e9684f6ca170b382cf84ff881abaa",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe7e622bc155bf14347904f6009b50e5346ab0dc8c2d47e8ebec05fadc6aee692",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ad7c",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_0_0_22000_d0g0v0_EIP158" : {
+    "modexp_0_0_0_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0xe8d690be83343690297d440ea39be7bf6398afc4276b1755640ce7cce8d121ea",
+                    "mixHash" : "0xe9c5eb5c5a8ea63797c84b01ef32f193a28fd0961f6c289bd1634f00661eae87",
+                    "nonce" : "0x5490d3d1f597e1d5",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0e9c5eb5c5a8ea63797c84b01ef32f193a28fd0961f6c289bd1634f00661eae87885490d3d1f597e1d5f90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xac08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48",
+                        "s" : "0x2a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe8d690be83343690297d440ea39be7bf6398afc4276b1755640ce7cce8d121ea",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ad7c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615284",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_0_0_22000_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/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x26cd40a59b69a4c096294af8bd8dd0b9d6edb91eeda1f035f44144c45b7b478c",
-                    "mixHash" : "0x5ad2f6800cb098676bcb165419cf1c7877e1356b4349127380579a052550a2d4",
-                    "nonce" : "0x9210071af5f48ccc",
+                    "hash" : "0x6cfc15cda056b659a67ae3bf3567463b4db9e0e0bdfd5c1419245c7a4243fdcf",
+                    "mixHash" : "0x98ad63c85e24f085bdd89f0f6b86332f45260929c71707a12774c807ba5b35f6",
+                    "nonce" : "0x1b15491edecb3d19",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xd00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a05ad2f6800cb098676bcb165419cf1c7877e1356b4349127380579a052550a2d4889210071af5f48cccf90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a098ad63c85e24f085bdd89f0f6b86332f45260929c71707a12774c807ba5b35f6881b15491edecb3d19f90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26cd40a59b69a4c096294af8bd8dd0b9d6edb91eeda1f035f44144c45b7b478c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6cfc15cda056b659a67ae3bf3567463b4db9e0e0bdfd5c1419245c7a4243fdcf",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_0_0_22000_d0g0v0_Frontier" : {
+    "modexp_0_0_0_22000_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/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac08",
-                    "hash" : "0x923cccd804451998b73957b8ee666a46a60e55366cf61cdc019fbb9e0200e758",
-                    "mixHash" : "0x1a8b95eb6a1a197454776c736eede40e09635d4c99cb7da38fa5904a8206af57",
-                    "nonce" : "0x050e7ee64ef0b47d",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x090939a882cd1cea489e89c28512d2482412539545ba8592c7ec7ffdcb4a4b16",
+                    "mixHash" : "0x2ad674b8690e32da961baa20df1532cd38a5a820d293e02ace420ee75e80f3e2",
+                    "nonce" : "0x7b09e29910fabc1b",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x39beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366c",
-                    "stateRoot" : "0x11ad7a074fcc396d5a5ec8afaa53e385f116c8b0cdce1aa557c5b1ecae687b99",
+                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
+                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a011ad7a074fcc396d5a5ec8afaa53e385f116c8b0cdce1aa557c5b1ecae687b99a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a039beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac088203e880a01a8b95eb6a1a197454776c736eede40e09635d4c99cb7da38fa5904a8206af5788050e7ee64ef0b47df90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a02ad674b8690e32da961baa20df1532cd38a5a820d293e02ace420ee75e80f3e2887b09e29910fabc1bf90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x923cccd804451998b73957b8ee666a46a60e55366cf61cdc019fbb9e0200e758",
-        "network" : "Frontier",
+        "lastblockhash" : "0x090939a882cd1cea489e89c28512d2482412539545ba8592c7ec7ffdcb4a4b16",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6adf6",
+                "balance" : "0x4563918244f6ad7c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761520a",
+                "balance" : "0x0de0b6b3a7615284",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_0_0_22000_d0g0v0_Homestead" : {
+    "modexp_0_0_0_22000_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/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac08",
-                    "hash" : "0xfc7de69c3ffce58c5d7962f7aadd820483f90e2d05c20d04fe5f6681a905821d",
-                    "mixHash" : "0x327145141048774161fab3d6ad222ad941194837710bfb6ec02943db3f96b383",
-                    "nonce" : "0x684ced18b7be9458",
+                    "hash" : "0xf69abebd9a662440865e793f6d7484aea58bfa528bb9305af615bbf2472d1990",
+                    "mixHash" : "0x3bda46e4c34baaad3bd322bf933aab504f523f9356d018bee5a2afc3b303b6bf",
+                    "nonce" : "0x8d5458bd8e24f60c",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x39beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366c",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xd00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a011ad7a074fcc396d5a5ec8afaa53e385f116c8b0cdce1aa557c5b1ecae687b99a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a039beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac088203e880a0327145141048774161fab3d6ad222ad941194837710bfb6ec02943db3f96b38388684ced18b7be9458f90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a011ad7a074fcc396d5a5ec8afaa53e385f116c8b0cdce1aa557c5b1ecae687b99a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a039beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac088203e880a03bda46e4c34baaad3bd322bf933aab504f523f9356d018bee5a2afc3b303b6bf888d5458bd8e24f60cf90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc7de69c3ffce58c5d7962f7aadd820483f90e2d05c20d04fe5f6681a905821d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf69abebd9a662440865e793f6d7484aea58bfa528bb9305af615bbf2472d1990",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_0_0_22000_d0g0v0_Metropolis" : {
+    "modexp_0_0_0_22000_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/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xab8e",
-                    "hash" : "0x161e7568d1c78d66cb6b0a6ed79d0168bf2e186f1b422699819edc39b272c724",
-                    "mixHash" : "0x424fdcc8acfa2a71b76626f0dfb6db2f7e1390db4b3f0426c170159b20f4fc2b",
-                    "nonce" : "0x7e392ea66d023b03",
+                    "gasUsed" : "0xac08",
+                    "hash" : "0x055c6eded74c8222161d6a3281ed65bf0e31ad764a2409baaf6de368c12841f0",
+                    "mixHash" : "0xd61f48a89c0afe8f866bb310c0ad40a0cdbce4241885225386543a5ee8e2f2db",
+                    "nonce" : "0xfea3ac6b6198602e",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
-                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "receiptTrie" : "0x39beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366c",
+                    "stateRoot" : "0x11ad7a074fcc396d5a5ec8afaa53e385f116c8b0cdce1aa557c5b1ecae687b99",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0424fdcc8acfa2a71b76626f0dfb6db2f7e1390db4b3f0426c170159b20f4fc2b887e392ea66d023b03f90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a011ad7a074fcc396d5a5ec8afaa53e385f116c8b0cdce1aa557c5b1ecae687b99a0d00b598fed0e541cdbb8f5f9fb27c99e8cf92221472fd91eb35d34b362809196a039beb22667f67353cb663a120ca3a6793265aac9adadf74bb9a46126ab53366cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac088203e880a0d61f48a89c0afe8f866bb310c0ad40a0cdbce4241885225386543a5ee8e2f2db88fea3ac6b6198602ef90107f90104010182ac0894c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0d47f897b0cb71f6d332ef9ca5bc8829b9538fd73efd81c98285e47382177cc48a02a22bb1732ba739a4ef1309fa09926c0dd98e3e678b527069896342111972106c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x161e7568d1c78d66cb6b0a6ed79d0168bf2e186f1b422699819edc39b272c724",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x055c6eded74c8222161d6a3281ed65bf0e31ad764a2409baaf6de368c12841f0",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ad7c",
+                "balance" : "0x4563918244f6adf6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615284",
+                "balance" : "0x0de0b6b3a761520a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0.json
index f614a7794..d527febc8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_0_0_25000_d0g0v0_EIP150" : {
+    "modexp_0_0_0_25000_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/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x11e4e81e23a862d7d770fd5aa557eabfe4d1081161f849238a58515faca3db82",
-                    "mixHash" : "0x6d1061ca9752f691bf637a996d63ada7e9bf579ee2864be30204162518b63de6",
-                    "nonce" : "0x4055359d9f694dc4",
+                    "hash" : "0xc52d0edad5d18f4a455e8cc5238f9ef1e995a67e866e2c3836c7490b3c768989",
+                    "mixHash" : "0x45c3cd9a9d43756d88aac648e4fd2095f024173e195c53f4dd6ecd65b84c34c6",
+                    "nonce" : "0xa29e35e5791ce853",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
-                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a06d1061ca9752f691bf637a996d63ada7e9bf579ee2864be30204162518b63de6884055359d9f694dc4f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a045c3cd9a9d43756d88aac648e4fd2095f024173e195c53f4dd6ecd65b84c34c688a29e35e5791ce853f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11e4e81e23a862d7d770fd5aa557eabfe4d1081161f849238a58515faca3db82",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc52d0edad5d18f4a455e8cc5238f9ef1e995a67e866e2c3836c7490b3c768989",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ad7c",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_0_0_25000_d0g0v0_EIP158" : {
+    "modexp_0_0_0_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0xed67a8bb68104f2dcf2846e8d2dba1cbe1136334b370533a86f426c468c315b2",
+                    "mixHash" : "0x95dba14ee99f9b9e9c06e74bc25b7f63f2233829e996f419a459ee98196aa4b1",
+                    "nonce" : "0x3191034e6f321ea3",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a095dba14ee99f9b9e9c06e74bc25b7f63f2233829e996f419a459ee98196aa4b1883191034e6f321ea3f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb7c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348",
+                        "s" : "0x7a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xed67a8bb68104f2dcf2846e8d2dba1cbe1136334b370533a86f426c468c315b2",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ad7c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615284",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_0_0_25000_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/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0xb6c89e5c9f747bf514422fc38321b9baf75833512a28538b3f09c901262df456",
-                    "mixHash" : "0xbf5af57618748ce26bd1e87ad82d81e1ce12db3cecd7cdb9fb8f30b286be386e",
-                    "nonce" : "0x6f285d2746c838b7",
+                    "hash" : "0x3c33395314bf0708fd85e46a97878ecbdefa585ddcbef8751cd4bdf3ecddf061",
+                    "mixHash" : "0xab5e49a78e8481f43af1486c2e507af8b5a45f2e1b6349077c9d30c241b8e1f2",
+                    "nonce" : "0x8e2b683ac4ee395e",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xd7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0bf5af57618748ce26bd1e87ad82d81e1ce12db3cecd7cdb9fb8f30b286be386e886f285d2746c838b7f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0ab5e49a78e8481f43af1486c2e507af8b5a45f2e1b6349077c9d30c241b8e1f2888e2b683ac4ee395ef90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6c89e5c9f747bf514422fc38321b9baf75833512a28538b3f09c901262df456",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3c33395314bf0708fd85e46a97878ecbdefa585ddcbef8751cd4bdf3ecddf061",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_0_0_25000_d0g0v0_Frontier" : {
+    "modexp_0_0_0_25000_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/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb7c0",
-                    "hash" : "0x6c7ef7beab5e8395135cf8a83c429cd2a54165c15d16bf5e3e55fe8bc56b9782",
-                    "mixHash" : "0x57f3b22e0f465ec76047e10961bec0af5145a3a7d137debd518e220a4ef41c4f",
-                    "nonce" : "0xbf41e289e32ac77f",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x8d7665f5bf5ad1ad327a36bcd7681db1a46f65e5bc310e2cab4631ab5ee7f1f1",
+                    "mixHash" : "0x08f6afcc80127edb9176d4a9d34f19363dab6ecdd1b269170f44795c63de6d15",
+                    "nonce" : "0x74220e37feac33d3",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x0eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5",
-                    "stateRoot" : "0x67e86fca556d7d1690f55a53084129b48c030edd67a1506c11d8fbe0a97f7b4a",
+                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
+                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a067e86fca556d7d1690f55a53084129b48c030edd67a1506c11d8fbe0a97f7b4aa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a00eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b7c08203e880a057f3b22e0f465ec76047e10961bec0af5145a3a7d137debd518e220a4ef41c4f88bf41e289e32ac77ff90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a008f6afcc80127edb9176d4a9d34f19363dab6ecdd1b269170f44795c63de6d158874220e37feac33d3f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c7ef7beab5e8395135cf8a83c429cd2a54165c15d16bf5e3e55fe8bc56b9782",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8d7665f5bf5ad1ad327a36bcd7681db1a46f65e5bc310e2cab4631ab5ee7f1f1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b9ae",
+                "balance" : "0x4563918244f6ad7c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614652",
+                "balance" : "0x0de0b6b3a7615284",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_0_0_25000_d0g0v0_Homestead" : {
+    "modexp_0_0_0_25000_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/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb7c0",
-                    "hash" : "0xc736b3b68fc566b2b185423bc269e9d39307836d5e6e9e736560ea30b36136b6",
-                    "mixHash" : "0xc5426540b00a696c5fe683e4821f496a40e4e460abfdef21f27a308351efe402",
-                    "nonce" : "0x4ba1c273bb04b23c",
+                    "hash" : "0xb80daf95f8de9b840aae189eca67d2c246460b49e6d5eebf3c7ddcc29e7144e5",
+                    "mixHash" : "0x4454b0fe2ee30db50b3b53d4eb13df770292a269aaae5d9e52bec1ecceab99f0",
+                    "nonce" : "0x6b144af65028f977",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x0eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xd7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a067e86fca556d7d1690f55a53084129b48c030edd67a1506c11d8fbe0a97f7b4aa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a00eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b7c08203e880a0c5426540b00a696c5fe683e4821f496a40e4e460abfdef21f27a308351efe402884ba1c273bb04b23cf90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a067e86fca556d7d1690f55a53084129b48c030edd67a1506c11d8fbe0a97f7b4aa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a00eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b7c08203e880a04454b0fe2ee30db50b3b53d4eb13df770292a269aaae5d9e52bec1ecceab99f0886b144af65028f977f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc736b3b68fc566b2b185423bc269e9d39307836d5e6e9e736560ea30b36136b6",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb80daf95f8de9b840aae189eca67d2c246460b49e6d5eebf3c7ddcc29e7144e5",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_0_0_25000_d0g0v0_Metropolis" : {
+    "modexp_0_0_0_25000_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/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xab8e",
-                    "hash" : "0x9b231677a43b4e4e9a1c076c91e16fbd15ad4505ab6237fd27a663e04e52296c",
-                    "mixHash" : "0x9a22f2c5542854aa25f2d6bab2d9ca80fe05d542b57978873c98875a5f851a61",
-                    "nonce" : "0xcd92078814a47a7a",
+                    "gasUsed" : "0xb7c0",
+                    "hash" : "0x1e55bbb1e4ebc6b4b2b7e3c957b4890665b91ada2d8cc99c060e522326b8e22b",
+                    "mixHash" : "0xa9ea09aba8f57a464584050c2b4b9dbfb3e8e23bf9c42659f917fdfa4bf9da8b",
+                    "nonce" : "0xfef7c5996fb9b895",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
-                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "receiptTrie" : "0x0eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5",
+                    "stateRoot" : "0x67e86fca556d7d1690f55a53084129b48c030edd67a1506c11d8fbe0a97f7b4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a09a22f2c5542854aa25f2d6bab2d9ca80fe05d542b57978873c98875a5f851a6188cd92078814a47a7af90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a067e86fca556d7d1690f55a53084129b48c030edd67a1506c11d8fbe0a97f7b4aa0d7b16e0c4c4ae0425bf37f7542096eacec89a6e26013d6b2768268e71dc44575a00eb3e952f9daebd9d74361c2182fdced6448846c6be1dbdd63feff87110dcbb5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b7c08203e880a0a9ea09aba8f57a464584050c2b4b9dbfb3e8e23bf9c42659f917fdfa4bf9da8b88fef7c5996fb9b895f90107f90104010182b7c094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0606e2a330e41998809a54137fde7edbb1508a853a36f53123b927c3bb4c75348a07a90ff5819055cee2c1b2b897b511754a3ceaefe81c18141414a741922fac9a3c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b231677a43b4e4e9a1c076c91e16fbd15ad4505ab6237fd27a663e04e52296c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1e55bbb1e4ebc6b4b2b7e3c957b4890665b91ada2d8cc99c060e522326b8e22b",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ad7c",
+                "balance" : "0x4563918244f6b9ae",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615284",
+                "balance" : "0x0de0b6b3a7614652",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0.json
index a2e6a2637..a2ec2d4ae 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_0_0_35000_d0g0v0_EIP150" : {
+    "modexp_0_0_0_35000_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/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x6cbc9a0d94a89df20d274e761191e38ea6bf647a1eec26718ca2f4e293f514ea",
-                    "mixHash" : "0x24912d21f0221d5e45d0c9c77ced3e707c59847deaf796798ab6e02e0c3d04d7",
-                    "nonce" : "0x2824325ff84d728d",
+                    "hash" : "0x345d36c3581183ce69b79385191a6f46e4e605b3074e0a8f6eb1cd3a79a43106",
+                    "mixHash" : "0x0a1c5621254607c6e618f3439b5364f58b2955a5244f4d0d46ffc783a6c4f3cf",
+                    "nonce" : "0xa27bc430663fd8c6",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
-                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a024912d21f0221d5e45d0c9c77ced3e707c59847deaf796798ab6e02e0c3d04d7882824325ff84d728df90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a00a1c5621254607c6e618f3439b5364f58b2955a5244f4d0d46ffc783a6c4f3cf88a27bc430663fd8c6f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cbc9a0d94a89df20d274e761191e38ea6bf647a1eec26718ca2f4e293f514ea",
-        "network" : "EIP150",
+        "lastblockhash" : "0x345d36c3581183ce69b79385191a6f46e4e605b3074e0a8f6eb1cd3a79a43106",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ad7c",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_0_0_35000_d0g0v0_EIP158" : {
+    "modexp_0_0_0_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0x0aad79e275cc379382cbe6b7f57adc135fef9f8ce7a872c6bb36e29166c47af5",
+                    "mixHash" : "0x1f6fdc4fd3b2a377116bc2586384c94cc329bb9e908162fbb774b38489462e2e",
+                    "nonce" : "0x8833604d82183cc9",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
+                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a01f6fdc4fd3b2a377116bc2586384c94cc329bb9e908162fbb774b38489462e2e888833604d82183cc9f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xded0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xb35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332",
+                        "s" : "0x2266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fc",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0aad79e275cc379382cbe6b7f57adc135fef9f8ce7a872c6bb36e29166c47af5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ad7c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615284",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_0_0_35000_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/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xab8e",
-                    "hash" : "0x65065efa1a11d2c6fcb2a12746cfdbb8dfb76db46a47bce0fe077c5f84d814c0",
-                    "mixHash" : "0xfc31d103f739c00327fff8e341e30fec5cd4eaa8da97c5acff7ec75b4af51e3e",
-                    "nonce" : "0xf23e0b7cb8eefa38",
+                    "hash" : "0xa558176f40b30c5fd58e35eda34a215788b385048cd7ff3d2391484419ac1ba2",
+                    "mixHash" : "0xe0bc410c346a36a1806678492dd998b7926e47c6f6c4e08a34e5bee51183d294",
+                    "nonce" : "0x0e31ff3265aa69b1",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x2cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0fc31d103f739c00327fff8e341e30fec5cd4eaa8da97c5acff7ec75b4af51e3e88f23e0b7cb8eefa38f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0e0bc410c346a36a1806678492dd998b7926e47c6f6c4e08a34e5bee51183d294880e31ff3265aa69b1f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65065efa1a11d2c6fcb2a12746cfdbb8dfb76db46a47bce0fe077c5f84d814c0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa558176f40b30c5fd58e35eda34a215788b385048cd7ff3d2391484419ac1ba2",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_0_0_35000_d0g0v0_Frontier" : {
+    "modexp_0_0_0_35000_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/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xded0",
-                    "hash" : "0xd633fcf66cf8ad11e29dc2c85eacbfbba1f2b46fa43a2959a542ff28825a7adf",
-                    "mixHash" : "0xf31b6faa2e8cd5e6f4a80e7bf96484c18d1e58031d9ea91b48b8c85a4d37a66b",
-                    "nonce" : "0x919fc63bd75bf0aa",
+                    "gasUsed" : "0xab8e",
+                    "hash" : "0xed5f0fa3a55782a01d3ba0d4f0d4d38bab654cebee706cd0e74815abffda2cdb",
+                    "mixHash" : "0xa66189dfffedd3117797e38b4831ee86e1fcda17dc9ba6c8f69a32181597beab",
+                    "nonce" : "0xdefe3d9972370d47",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xc539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91",
-                    "stateRoot" : "0xacbc2830dc0792d75f7039be2089542125cbd0dea63eb49670cce71cf47facb9",
+                    "receiptTrie" : "0x68dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528",
+                    "stateRoot" : "0x4190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0acbc2830dc0792d75f7039be2089542125cbd0dea63eb49670cce71cf47facb9a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0c539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ded08203e880a0f31b6faa2e8cd5e6f4a80e7bf96484c18d1e58031d9ea91b48b8c85a4d37a66b88919fc63bd75bf0aaf90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04190b67d2a0b54fef7417f5ad4084de41aef4f52a1d16065dbd25b757ba3420fa02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da068dd45b66213a45d44ac0fbd3a3fd612287beeb9f1bfb25aa8baa150f41f0528b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a0a66189dfffedd3117797e38b4831ee86e1fcda17dc9ba6c8f69a32181597beab88defe3d9972370d47f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd633fcf66cf8ad11e29dc2c85eacbfbba1f2b46fa43a2959a542ff28825a7adf",
-        "network" : "Frontier",
+        "lastblockhash" : "0xed5f0fa3a55782a01d3ba0d4f0d4d38bab654cebee706cd0e74815abffda2cdb",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e0be",
+                "balance" : "0x4563918244f6ad7c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611f42",
+                "balance" : "0x0de0b6b3a7615284",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_0_0_35000_d0g0v0_Homestead" : {
+    "modexp_0_0_0_35000_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/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xded0",
-                    "hash" : "0x2701c06b61e4f7938465b6ae47cedf1a2c932599f57b66bfcb5d29817a46d0f2",
-                    "mixHash" : "0x46f7c523dbd91a4da55633d3aaf468af63d45e644b176eeac06276223b5de1a7",
-                    "nonce" : "0x5b452f1a3beb7a7c",
+                    "hash" : "0x72792cf4962bc795355956d19e364c960504837b984977ae11e2b27db3f1cc34",
+                    "mixHash" : "0xde4e59fe7eac138dfeae8317cc6ff8df01484103b3c124a73393bfa33ced1f61",
+                    "nonce" : "0xc6c8f959c050c034",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
                     "receiptTrie" : "0xc539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x2cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0acbc2830dc0792d75f7039be2089542125cbd0dea63eb49670cce71cf47facb9a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0c539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ded08203e880a046f7c523dbd91a4da55633d3aaf468af63d45e644b176eeac06276223b5de1a7885b452f1a3beb7a7cf90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0acbc2830dc0792d75f7039be2089542125cbd0dea63eb49670cce71cf47facb9a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0c539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ded08203e880a0de4e59fe7eac138dfeae8317cc6ff8df01484103b3c124a73393bfa33ced1f6188c6c8f959c050c034f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2701c06b61e4f7938465b6ae47cedf1a2c932599f57b66bfcb5d29817a46d0f2",
-        "network" : "Homestead",
+        "lastblockhash" : "0x72792cf4962bc795355956d19e364c960504837b984977ae11e2b27db3f1cc34",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_0_0_35000_d0g0v0_Metropolis" : {
+    "modexp_0_0_0_35000_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/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xab8e",
-                    "hash" : "0x5fdc4279e91b3e5c6736bca41466ab18795a663ac62f01f3c157e5c04f7d2637",
-                    "mixHash" : "0x0092edc9efe2225c0fb9d6a7e14d93531b17d324df0020cb7449caa8e5c17806",
-                    "nonce" : "0xf14ba9792e09cf76",
+                    "gasUsed" : "0xded0",
+                    "hash" : "0xfaa6c262a147858abcefb5ec4b2ccb1f6acf9455c5439c0d85034dc92295e8c1",
+                    "mixHash" : "0x8821c15559b3c547eef77dc7f9e0c000424f8ab76f4a0754d21b7912d0e1c7b9",
+                    "nonce" : "0x089c775c3dd3c817",
                     "number" : "0x01",
                     "parentHash" : "0x2e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338",
-                    "receiptTrie" : "0xe3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16",
-                    "stateRoot" : "0x9c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501",
+                    "receiptTrie" : "0xc539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91",
+                    "stateRoot" : "0xacbc2830dc0792d75f7039be2089542125cbd0dea63eb49670cce71cf47facb9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a09c4a7f832ec8f9ebfdf71b3aa57d4d8b7a857616708052626f29d2ebaa35e501a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0e3fd54c6c8f3b4a77c61defe791a6ee0ee83dc4dc65080cfce5924ff6ae0eb16b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ab8e8203e880a00092edc9efe2225c0fb9d6a7e14d93531b17d324df0020cb7449caa8e5c1780688f14ba9792e09cf76f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
+                "rlp" : "0xf90306f901f8a02e0988123199c209e92c5f6c436ed6b4654f37f89515f15c0b148092de68b338a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0acbc2830dc0792d75f7039be2089542125cbd0dea63eb49670cce71cf47facb9a02cfe75bb91f6a0f3af1824a0065471640e67a4b4246db1d3d075df846132986da0c539a1099353287381b5d2c94f673201591bf34a3151aaf4fc3483ba7e828b91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ded08203e880a08821c15559b3c547eef77dc7f9e0c000424f8ab76f4a0754d21b7912d0e1c7b988089c775c3dd3c817f90107f90104010182ded094c305c901078781c232a2a521c2af7980f8385ee980b8a430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0b35394d524b38c3c4595798af70068522958771dd4e7b5a36ef55ef037b66332a02266f72c6ec2516382f9253629f0486c2dfd4e4a5d78309a1c38c78cea9563fcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a050eafd9ece79636f8a4027956b0526035b0fa490869311997fca2558ea484f63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fdc4279e91b3e5c6736bca41466ab18795a663ac62f01f3c157e5c04f7d2637",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfaa6c262a147858abcefb5ec4b2ccb1f6acf9455c5439c0d85034dc92295e8c1",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ad7c",
+                "balance" : "0x4563918244f6e0be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615284",
+                "balance" : "0x0de0b6b3a7611f42",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json
index 7299a1a0f..bf86636f8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_1_0_1000000_d0g0v0_EIP150" : {
+    "modexp_0_1_0_1000000_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/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xebe840bdcdfac7d1a535b04ec5086fedfd4453573406d49fc24e7a729e321a02",
-                    "mixHash" : "0xca0c285e1d73b1b61b8a9b31f999c1949c55d3687b1a85cfe968a78db68f32de",
-                    "nonce" : "0x86ac8476ed7de447",
+                    "hash" : "0xaf5940fb8ab0f36eb8e2fdce18fa6bc7076fe9e3cbd4e36b1cfde8d44a5b63a1",
+                    "mixHash" : "0xdffc38e744fabe31978231835b71b6d5530921dcb36d6806996936f9571e80aa",
+                    "nonce" : "0x93a6ed7c330f02ce",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0ca0c285e1d73b1b61b8a9b31f999c1949c55d3687b1a85cfe968a78db68f32de8886ac8476ed7de447f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0dffc38e744fabe31978231835b71b6d5530921dcb36d6806996936f9571e80aa8893a6ed7c330f02cef90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xebe840bdcdfac7d1a535b04ec5086fedfd4453573406d49fc24e7a729e321a02",
-        "network" : "EIP150",
+        "lastblockhash" : "0xaf5940fb8ab0f36eb8e2fdce18fa6bc7076fe9e3cbd4e36b1cfde8d44a5b63a1",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_1_0_1000000_d0g0v0_EIP158" : {
+    "modexp_0_1_0_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x423058aeeb5babd2adb6a3d61dd3b6cd3196f2070f2b812aa46ef2d2031fcae5",
+                    "mixHash" : "0x7bfed5211da86b71d4d88376a74daad57a690a87917b47690713da2821e7427d",
+                    "nonce" : "0xcf56cd3658a27412",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07bfed5211da86b71d4d88376a74daad57a690a87917b47690713da2821e7427d88cf56cd3658a27412f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9958",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8df",
+                        "s" : "0x0484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x423058aeeb5babd2adb6a3d61dd3b6cd3196f2070f2b812aa46ef2d2031fcae5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_1_0_1000000_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/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xb73f9748817176e68c1fbe2a476a47c906c5a83be2c4a000da24f794a3328097",
-                    "mixHash" : "0x8044686960ec3ed7924e48439dd9f0d151ebd88ad3a646e444f4037de69c8730",
-                    "nonce" : "0x5d20ded4e65081c9",
+                    "hash" : "0xebdf05ba7bd15953a180a451530725fc9bc07f5bf50dfb49aa28b96a0ff1d6bc",
+                    "mixHash" : "0xb2a9e9d2046ad06c5a3a8eae61fc0cafbc1ffb68a2864825e9fd04eacb52e287",
+                    "nonce" : "0xc1289c146b75d98b",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a08044686960ec3ed7924e48439dd9f0d151ebd88ad3a646e444f4037de69c8730885d20ded4e65081c9f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0b2a9e9d2046ad06c5a3a8eae61fc0cafbc1ffb68a2864825e9fd04eacb52e28788c1289c146b75d98bf90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb73f9748817176e68c1fbe2a476a47c906c5a83be2c4a000da24f794a3328097",
-        "network" : "EIP158",
+        "lastblockhash" : "0xebdf05ba7bd15953a180a451530725fc9bc07f5bf50dfb49aa28b96a0ff1d6bc",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_1_0_1000000_d0g0v0_Frontier" : {
+    "modexp_0_1_0_1000000_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/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9958",
-                    "hash" : "0x99326de0c8db2e7cbfc7c1385868b1e8b942487bd1db556501882686b40cc739",
-                    "mixHash" : "0x9f764a3f84be011eaf1695eab99e7977a35259dd7250e2db4aa01a8aa9afb428",
-                    "nonce" : "0x0d6c589e3bd13cf4",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xb5ac1465c6617e8998b08032d56b315d318adb1051dc9ff61657257dcb4389c1",
+                    "mixHash" : "0x215d0ab2a2e37dd3edaf907f05b882729ac504a94cccdf1443d8c244cf9396fa",
+                    "nonce" : "0xfcd0a8cee0fe28c5",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x3c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41",
-                    "stateRoot" : "0x33fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949be",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a09f764a3f84be011eaf1695eab99e7977a35259dd7250e2db4aa01a8aa9afb428880d6c589e3bd13cf4f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0215d0ab2a2e37dd3edaf907f05b882729ac504a94cccdf1443d8c244cf9396fa88fcd0a8cee0fe28c5f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99326de0c8db2e7cbfc7c1385868b1e8b942487bd1db556501882686b40cc739",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb5ac1465c6617e8998b08032d56b315d318adb1051dc9ff61657257dcb4389c1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059b46",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75264ba",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_1_0_1000000_d0g0v0_Homestead" : {
+    "modexp_0_1_0_1000000_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/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9958",
-                    "hash" : "0x0d5013f68d7d3520d0432ec0d6df9e0f9edbaeba57d5c15334c57067d752231c",
-                    "mixHash" : "0x7ed6236a086a8f168e8867e2f32cb4b7accda5b1ea2111ac739c9e7a1f4d85d8",
-                    "nonce" : "0x0051d484bd9e30f5",
+                    "hash" : "0x6a65a0209170588ae734d1ce278a83c3dff1ea96ecd5247a3061f529d46f4492",
+                    "mixHash" : "0x6160b64abfb395768f10e9c50276e02e3429d6c76383f1d6c689ac918c3e9427",
+                    "nonce" : "0x5fbf57155257244d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x3c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a07ed6236a086a8f168e8867e2f32cb4b7accda5b1ea2111ac739c9e7a1f4d85d8880051d484bd9e30f5f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a06160b64abfb395768f10e9c50276e02e3429d6c76383f1d6c689ac918c3e9427885fbf57155257244df90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d5013f68d7d3520d0432ec0d6df9e0f9edbaeba57d5c15334c57067d752231c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6a65a0209170588ae734d1ce278a83c3dff1ea96ecd5247a3061f529d46f4492",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_1_0_1000000_d0g0v0_Metropolis" : {
+    "modexp_0_1_0_1000000_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/stPreCompiledContracts/modexp_0_1_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x9c1d9530cd9a674fc10473e7ffc4753b3a718ce1ddd92b9da2bc6037f0cbfaff",
-                    "mixHash" : "0x19810b3ced267c77a1a3e097436040cbd68548e22d8cade18578f5763ce30f71",
-                    "nonce" : "0x0d934bc744c1e626",
+                    "gasUsed" : "0x0f9958",
+                    "hash" : "0x911d790028c88b2d67284cf01e7e53d94a47678e56d39dc154697faebea37e3e",
+                    "mixHash" : "0x3010ab26db173a57d763d0b322dae74c0efe66db0062f310c79f363d6c683041",
+                    "nonce" : "0xbebb3165c9037100",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x3c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41",
+                    "stateRoot" : "0x33fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949be",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a019810b3ced267c77a1a3e097436040cbd68548e22d8cade18578f5763ce30f71880d934bc744c1e626f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea0ec8ad4a328f4d97e2cdf48603befb0fadbd335fafd5e9bb2c2eed17adbe9be8aa03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a03010ab26db173a57d763d0b322dae74c0efe66db0062f310c79f363d6c68304188bebb3165c9037100f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0ffbbae770f0b6e4dabe1a122f375893e73babccc095bf72818224ad80c4ef8dfa00484cec30daf0178b4b0704f6ddc6eecaf786c64ee90fbae17e434029e5b8f53c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c1d9530cd9a674fc10473e7ffc4753b3a718ce1ddd92b9da2bc6037f0cbfaff",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x911d790028c88b2d67284cf01e7e53d94a47678e56d39dc154697faebea37e3e",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918245059b46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a75264ba",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json
index 1b7f05b34..24ee81f36 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_1_0_155000_d0g0v0_EIP150" : {
+    "modexp_0_1_0_155000_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/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x63f7692c9813a33b90e9bf7ab6d8b6ee1c2cfe0adfa517354e9b9f47b0850f73",
-                    "mixHash" : "0x7dca101075928deba91102c22549bb00bef83275427217d98b1ebc4161582ad3",
-                    "nonce" : "0x77550b762aadbdef",
+                    "hash" : "0x1e00d1d67fad750167e1a5a3774d652067452c60d467eba388e9c00eb3cd8ed3",
+                    "mixHash" : "0xe4a0fbecf7b5c4d4e4832f7872df5bf90a608d857ccaa3bf82a66bceb7af04f6",
+                    "nonce" : "0x36ad915b18f7869d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07dca101075928deba91102c22549bb00bef83275427217d98b1ebc4161582ad38877550b762aadbdeff90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e4a0fbecf7b5c4d4e4832f7872df5bf90a608d857ccaa3bf82a66bceb7af04f68836ad915b18f7869df90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63f7692c9813a33b90e9bf7ab6d8b6ee1c2cfe0adfa517354e9b9f47b0850f73",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1e00d1d67fad750167e1a5a3774d652067452c60d467eba388e9c00eb3cd8ed3",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_1_0_155000_d0g0v0_EIP158" : {
+    "modexp_0_1_0_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x8e945cd079dd32d115b13b5bb098b8b29debf963d35133576ad4eb32c165299e",
+                    "mixHash" : "0xe514a5d84d8ea05986a9eea10e07d178fb14fcf1d3e59a1e4114e5dc0fb8932c",
+                    "nonce" : "0xfe1253fb90fa0c95",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e514a5d84d8ea05986a9eea10e07d178fb14fcf1d3e59a1e4114e5dc0fb8932c88fe1253fb90fa0c95f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b490",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9a",
+                        "s" : "0x381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8e945cd079dd32d115b13b5bb098b8b29debf963d35133576ad4eb32c165299e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_1_0_155000_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/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x5936b5e48ff9f6945f25f1a6c86365940e46b0b4afcb8b90d229b9d63fadd5f5",
-                    "mixHash" : "0x9727d09d229a3b4e16305d3b9916ca929cf7865d211fef66b750ce79777b215d",
-                    "nonce" : "0x65c23e41a79530fb",
+                    "hash" : "0x77d22fdcb84287fa208822785f25dc1062a0917fbd199d679d573374ed827318",
+                    "mixHash" : "0x5605944d73d3dbfe02293ccc0bb64c2f7cb07f462ec0d742ba8077e6af05a088",
+                    "nonce" : "0xbcce224b5a22bfab",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a09727d09d229a3b4e16305d3b9916ca929cf7865d211fef66b750ce79777b215d8865c23e41a79530fbf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a05605944d73d3dbfe02293ccc0bb64c2f7cb07f462ec0d742ba8077e6af05a08888bcce224b5a22bfabf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5936b5e48ff9f6945f25f1a6c86365940e46b0b4afcb8b90d229b9d63fadd5f5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x77d22fdcb84287fa208822785f25dc1062a0917fbd199d679d573374ed827318",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_1_0_155000_d0g0v0_Frontier" : {
+    "modexp_0_1_0_155000_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/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b490",
-                    "hash" : "0xe8ab4f9d33a53565441b732696acc893236f247c84fa4e312eff117635062949",
-                    "mixHash" : "0xb7f1ea2d906c15ae6743afae470803bb4dfa39aabc7086fbcc52b06c4772a058",
-                    "nonce" : "0x993f517aacb11d8c",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x310c559b3a32638c1cae6a903a6427ba58000b28550091687cb9dddaf4747f9c",
+                    "mixHash" : "0x4109c08468416a5c1d520553024ca1d6b5322e9e310c374114b964f7a0fbb8c3",
+                    "nonce" : "0xa4e263584e95f493",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x7cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bf",
-                    "stateRoot" : "0x65bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a0b7f1ea2d906c15ae6743afae470803bb4dfa39aabc7086fbcc52b06c4772a05888993f517aacb11d8cf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04109c08468416a5c1d520553024ca1d6b5322e9e310c374114b964f7a0fbb8c388a4e263584e95f493f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8ab4f9d33a53565441b732696acc893236f247c84fa4e312eff117635062949",
-        "network" : "Frontier",
+        "lastblockhash" : "0x310c559b3a32638c1cae6a903a6427ba58000b28550091687cb9dddaf4747f9c",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b67e",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4982",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_1_0_155000_d0g0v0_Homestead" : {
+    "modexp_0_1_0_155000_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/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b490",
-                    "hash" : "0x56548c5d5d0083d6ddebfdb10b0c084cd335a9df5f6a1704c6470d5ee4d0fc54",
-                    "mixHash" : "0x838ff03b6f1cd434737f0d8b9e20024fa72212335cde013e6a3a71c2cc27189c",
-                    "nonce" : "0x334869bbcc90a34e",
+                    "hash" : "0xaff278d2e0dcc2117e8465711f28339a422b5f40b3f7c04869035be3f87adb9d",
+                    "mixHash" : "0xb933ed51759cab99aff24685b7719e17fb60e6db22fdd743c55411ccb6870f89",
+                    "nonce" : "0x5859b08065df827e",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x7cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bf",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a0838ff03b6f1cd434737f0d8b9e20024fa72212335cde013e6a3a71c2cc27189c88334869bbcc90a34ef90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a0b933ed51759cab99aff24685b7719e17fb60e6db22fdd743c55411ccb6870f89885859b08065df827ef90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56548c5d5d0083d6ddebfdb10b0c084cd335a9df5f6a1704c6470d5ee4d0fc54",
-        "network" : "Homestead",
+        "lastblockhash" : "0xaff278d2e0dcc2117e8465711f28339a422b5f40b3f7c04869035be3f87adb9d",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_1_0_155000_d0g0v0_Metropolis" : {
+    "modexp_0_1_0_155000_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/stPreCompiledContracts/modexp_0_1_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0xcc1e19c5d93181babe25d8551ccec334c122c62bb3e4683b2a53a7f9e19fc831",
-                    "mixHash" : "0x362bec812601f932a6fd89ee0369d822bdd6248e052e54b8330a43db327e6cf1",
-                    "nonce" : "0x0573113d3052b75e",
+                    "gasUsed" : "0x02b490",
+                    "hash" : "0xd5eb9e9537a36179cace5dfc88b4070f3290bdd825a328e8a0b8d1593f6261ee",
+                    "mixHash" : "0x2be202b0d7193a6f803ee99d6a6135309b7e506f68c37a30c908eef9e42ea5dd",
+                    "nonce" : "0xf0be0008f329db10",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x7cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bf",
+                    "stateRoot" : "0x65bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0362bec812601f932a6fd89ee0369d822bdd6248e052e54b8330a43db327e6cf1880573113d3052b75ef90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a0d02b90f4e491febd7a54fe47554802d0b59a6de44d8ca6bdac16f04464802979a07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a02be202b0d7193a6f803ee99d6a6135309b7e506f68c37a30c908eef9e42ea5dd88f0be0008f329db10f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0c5ab123eec40967902c8c8b240167bd36278a3fc9818114a75153d89bd3c2f9aa0381253fb844e93039f77e50a25e1d03688dcb2a2ea219d12729d352b3d2563e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc1e19c5d93181babe25d8551ccec334c122c62bb3e4683b2a53a7f9e19fc831",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd5eb9e9537a36179cace5dfc88b4070f3290bdd825a328e8a0b8d1593f6261ee",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f8b67e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a75f4982",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json
index 06e1bf102..2f2eeeb67 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_1_0_20500_d0g0v0_EIP150" : {
+    "modexp_0_1_0_20500_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/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0xf0b6dd13f3dcd6bc62dbf230508ca1eaa0a3b80e13652465377bcbc65c287f71",
-                    "mixHash" : "0x626a1b9a5e73b453b06faf5b151bdae8fa29189a72e831a1d80f98baab098027",
-                    "nonce" : "0x71a1851bc2fbf88d",
+                    "hash" : "0x5455d1e76ef5900a8f9f84664188823a964504b04a89677ceaea7245a4d36d8f",
+                    "mixHash" : "0xebfe3afde4e428910e2d222e26e9f2c0be69d43efa047f4fb5f174e45963f1fc",
+                    "nonce" : "0x3346638d90221dfc",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
-                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
+                    "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
+                    "stateRoot" : "0x3b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0626a1b9a5e73b453b06faf5b151bdae8fa29189a72e831a1d80f98baab0980278871a1851bc2fbf88df90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0ebfe3afde4e428910e2d222e26e9f2c0be69d43efa047f4fb5f174e45963f1fc883346638d90221dfcf90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0b6dd13f3dcd6bc62dbf230508ca1eaa0a3b80e13652465377bcbc65c287f71",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5455d1e76ef5900a8f9f84664188823a964504b04a89677ceaea7245a4d36d8f",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a91a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_0_1_0_20500_d0g0v0_EIP158" : {
+    "modexp_0_1_0_20500_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/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x4037871389634df76d779fc3e4fc513a5abf7a0185856dd29ebbd5c74751d91a",
-                    "mixHash" : "0xb4119e8cd43c23aa2d63aaed18b7367f7fa8e1b63d4ace6728e242d03c32e02f",
-                    "nonce" : "0x0b4e8b1c92764c8a",
+                    "hash" : "0x0253721af26913475677f848d47e48c782bb1b5c58f3e16e2970a08760055c85",
+                    "mixHash" : "0xd691924f2dfeb780b4e6c2fbe485416a88144124fe90e2530c634d97c9f8d96a",
+                    "nonce" : "0x215565a6708c61e6",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
-                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
+                    "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
+                    "stateRoot" : "0x3b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0b4119e8cd43c23aa2d63aaed18b7367f7fa8e1b63d4ace6728e242d03c32e02f880b4e8b1c92764c8af90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0d691924f2dfeb780b4e6c2fbe485416a88144124fe90e2530c634d97c9f8d96a88215565a6708c61e6f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4037871389634df76d779fc3e4fc513a5abf7a0185856dd29ebbd5c74751d91a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0253721af26913475677f848d47e48c782bb1b5c58f3e16e2970a08760055c85",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a91a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_0_1_0_20500_d0g0v0_Frontier" : {
+    "modexp_0_1_0_20500_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/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x591d25524938845366ba34a5af2e779cf7e9e4e908fbc0b7f3ef8c4b27e862fb",
-                    "mixHash" : "0x506627dd915340ec63990d3e21d19aee2d80e90d864027daafe6db4e4124f06a",
-                    "nonce" : "0x3283cb354edfd4d2",
+                    "hash" : "0x8f720899dcb42577fb4ba78df5fdbb74a4cfd9ccd1f1384bb078f22a5ea4fc43",
+                    "mixHash" : "0x196e34a49ee5da8237b829e981d707aa81546fba32aa42fae83c64e092a04b2b",
+                    "nonce" : "0x77d0d5c0e746d7a6",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0506627dd915340ec63990d3e21d19aee2d80e90d864027daafe6db4e4124f06a883283cb354edfd4d2f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0196e34a49ee5da8237b829e981d707aa81546fba32aa42fae83c64e092a04b2b8877d0d5c0e746d7a6f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x591d25524938845366ba34a5af2e779cf7e9e4e908fbc0b7f3ef8c4b27e862fb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8f720899dcb42577fb4ba78df5fdbb74a4cfd9ccd1f1384bb078f22a5ea4fc43",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_0_1_0_20500_d0g0v0_Homestead" : {
+    "modexp_0_1_0_20500_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/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x17606367ad7bbf40656f4b7abe0f274e23b65d3523e29defe6fdd496f399ede5",
-                    "mixHash" : "0xb32e8d30f3e4dc11750ccf6432116284cfb0abb351ae3dfb242f4df6824fd31b",
-                    "nonce" : "0xf685cc6be3e3f8ce",
+                    "hash" : "0x7f30a53eeedebe3578e25afffbfd102ba6fd57cef838de9d39a424c9fde800d9",
+                    "mixHash" : "0xd688bd48f4dabae65739d853242ea65e70bdf5313f86d1162d55707a6884e4f4",
+                    "nonce" : "0x726d1c1125510d4e",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0b32e8d30f3e4dc11750ccf6432116284cfb0abb351ae3dfb242f4df6824fd31b88f685cc6be3e3f8cef90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0d688bd48f4dabae65739d853242ea65e70bdf5313f86d1162d55707a6884e4f488726d1c1125510d4ef90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17606367ad7bbf40656f4b7abe0f274e23b65d3523e29defe6fdd496f399ede5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7f30a53eeedebe3578e25afffbfd102ba6fd57cef838de9d39a424c9fde800d9",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_0_1_0_20500_d0g0v0_Metropolis" : {
+    "modexp_0_1_0_20500_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/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x3a4b42870027dcda9d637da54aab5a52c01bf183917adc33be79432e78d0aa6c",
-                    "mixHash" : "0x8acde89bd7b58b80cd74318463950920007aadecd9d8c1636af3c953b0f17a75",
-                    "nonce" : "0x61e51534313cb463",
+                    "hash" : "0xf800f5bbe88c8d1750f04b1f24a8563d56101e7c5f03ca0fc6c72d3daa26addc",
+                    "mixHash" : "0x7f2265d203ea09f470e97e902a5c64bc8f0f093b988e45012932bc25d479e60f",
+                    "nonce" : "0x4ec07af061faf150",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
-                    "stateRoot" : "0x3b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7",
+                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
+                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a08acde89bd7b58b80cd74318463950920007aadecd9d8c1636af3c953b0f17a758861e51534313cb463f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a07f2265d203ea09f470e97e902a5c64bc8f0f093b988e45012932bc25d479e60f884ec07af061faf150f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a4b42870027dcda9d637da54aab5a52c01bf183917adc33be79432e78d0aa6c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf800f5bbe88c8d1750f04b1f24a8563d56101e7c5f03ca0fc6c72d3daa26addc",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6a91a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76156e6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_1_0_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_1_0_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa72c",
+                    "hash" : "0xe7535e9bea6f011697a40165287b90826a61cab618931d88273a80b0925b4baa",
+                    "mixHash" : "0xf05a0bb3fa1f9396589e99102173899c708c507428003dba3c912cf2e549bf7c",
+                    "nonce" : "0xdd6763523e18a8c8",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
+                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0ff0aae8e95c0f9eed20986a75e41ecc08190558763d7b634b19e7852375cb659a0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0f05a0bb3fa1f9396589e99102173899c708c507428003dba3c912cf2e549bf7c88dd6763523e18a8c8f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0e361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3a0223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa72c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe361d4e37219fb64bc015abef864eb328d5d583b8ac581d37f57e2f8c73db8b3",
+                        "s" : "0x223eaae08321d95675f17b002108b8506265f96923d714f718d896c3c8c1b782",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe7535e9bea6f011697a40165287b90826a61cab618931d88273a80b0925b4baa",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json
index d2358f814..668e2081c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_1_0_22000_d0g0v0_EIP150" : {
+    "modexp_0_1_0_22000_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/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xbe451269aa5c74ccdea36bc5e8c5e274d6da982f8f0cbaf8f2480a7150d75ffd",
-                    "mixHash" : "0xcdde78eaac0cb5bc5c832a5c1c7bb6f4e4e4d33ba35f6f93c44e2a27d53d7d49",
-                    "nonce" : "0xe86356cfe38a0527",
+                    "hash" : "0x2821e28ce054c15b492d0f87facaca47c2f0de5bd813e2ba2d716e80a82c4a39",
+                    "mixHash" : "0xb3005ca580e310dbfdc833440b1e5195f60d9f2d16c5f034838c78ca462531b8",
+                    "nonce" : "0x5937ab113db7768d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0cdde78eaac0cb5bc5c832a5c1c7bb6f4e4e4d33ba35f6f93c44e2a27d53d7d4988e86356cfe38a0527f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0b3005ca580e310dbfdc833440b1e5195f60d9f2d16c5f034838c78ca462531b8885937ab113db7768df90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe451269aa5c74ccdea36bc5e8c5e274d6da982f8f0cbaf8f2480a7150d75ffd",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2821e28ce054c15b492d0f87facaca47c2f0de5bd813e2ba2d716e80a82c4a39",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_1_0_22000_d0g0v0_EIP158" : {
+    "modexp_0_1_0_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xaaf7c01bcefef182973a35cabe9321ef62a589797bc03def2242d3c794131cbb",
+                    "mixHash" : "0x04a952317cef6e774f2307f98763a9747a058bdcda9eed4240882c83b72bd95a",
+                    "nonce" : "0x1998d90b9015b886",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a004a952317cef6e774f2307f98763a9747a058bdcda9eed4240882c83b72bd95a881998d90b9015b886f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xad08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054",
+                        "s" : "0x64dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53ea",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaaf7c01bcefef182973a35cabe9321ef62a589797bc03def2242d3c794131cbb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_1_0_22000_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/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xb21af1f7321c7d11d6cee41d612f6eea93673cd0f2320d3171157c5b84961ead",
-                    "mixHash" : "0xf82dc4e73207d496bb611b0f71e1b1f95bd7b2f1fbae950b96b66adf94920ed8",
-                    "nonce" : "0x9451b922cfb4aecf",
+                    "hash" : "0x7c9ff24e6137182537bbf76d9d027c7372b8b416a5c315f065726e9f84371c9d",
+                    "mixHash" : "0xcd76f1c5b86e14c82ea026c43be8ffe40262c232206c09576f90838174ce8822",
+                    "nonce" : "0x4956b8d54b026e04",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f82dc4e73207d496bb611b0f71e1b1f95bd7b2f1fbae950b96b66adf94920ed8889451b922cfb4aecff90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0cd76f1c5b86e14c82ea026c43be8ffe40262c232206c09576f90838174ce8822884956b8d54b026e04f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb21af1f7321c7d11d6cee41d612f6eea93673cd0f2320d3171157c5b84961ead",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7c9ff24e6137182537bbf76d9d027c7372b8b416a5c315f065726e9f84371c9d",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_1_0_22000_d0g0v0_Frontier" : {
+    "modexp_0_1_0_22000_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/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad08",
-                    "hash" : "0x31823621925decf58745aef0be3e0152f2fae067885bf7c7b6819c05493359b9",
-                    "mixHash" : "0x39e192a15ea067d14b4223fd18defeda9dc65083c81b7e9365aef7a3b49f76e3",
-                    "nonce" : "0x70dc638b1c1e22bc",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xdf8aa77e7b33decb49d4bddee7b3ecc7db43642ef85c1e0a0b4b50957ee83507",
+                    "mixHash" : "0x4caa389977e4cdb12709c46a3bf7cac3af0911d62d0cba5b41b2b143a7937f4f",
+                    "nonce" : "0xf45ea578fda0f1ed",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231",
-                    "stateRoot" : "0xd1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a039e192a15ea067d14b4223fd18defeda9dc65083c81b7e9365aef7a3b49f76e38870dc638b1c1e22bcf90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04caa389977e4cdb12709c46a3bf7cac3af0911d62d0cba5b41b2b143a7937f4f88f45ea578fda0f1edf90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31823621925decf58745aef0be3e0152f2fae067885bf7c7b6819c05493359b9",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdf8aa77e7b33decb49d4bddee7b3ecc7db43642ef85c1e0a0b4b50957ee83507",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aef6",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761510a",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_1_0_22000_d0g0v0_Homestead" : {
+    "modexp_0_1_0_22000_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/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad08",
-                    "hash" : "0x90e779fe335f7e226302253118c6a788c44b20b559259906c7ac4d6463614d3f",
-                    "mixHash" : "0xa609c667f6dfd5b22ea550a2164c8d102c895a2455cabd287803ef139a463d5a",
-                    "nonce" : "0x55b74ec980a08cb5",
+                    "hash" : "0x518af38f4387b3f192d32465600100c23a83da2e8c383654b854e0c2b4fd6d4e",
+                    "mixHash" : "0xd4aba74999479d539048cda6c4475df50f21df38ed1e2d0b507fcd183da51e7a",
+                    "nonce" : "0x3b95357180503998",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a0a609c667f6dfd5b22ea550a2164c8d102c895a2455cabd287803ef139a463d5a8855b74ec980a08cb5f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a0d4aba74999479d539048cda6c4475df50f21df38ed1e2d0b507fcd183da51e7a883b95357180503998f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90e779fe335f7e226302253118c6a788c44b20b559259906c7ac4d6463614d3f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x518af38f4387b3f192d32465600100c23a83da2e8c383654b854e0c2b4fd6d4e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_1_0_22000_d0g0v0_Metropolis" : {
+    "modexp_0_1_0_22000_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/stPreCompiledContracts/modexp_0_1_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x6f2fc93c41aa03ca765577e9ca2947eb8eb76ba8fdf5d7c25db7124f238e6986",
-                    "mixHash" : "0x21009d7b0fc7f905da8d4186f4773c3b88b9207542646ee6b134c53dbd8e6935",
-                    "nonce" : "0x10833a2806ab5ef0",
+                    "gasUsed" : "0xad08",
+                    "hash" : "0x62799947cadef222062ffed18b10dcd87512cf0d10b274cfed5cfa475b53f8ef",
+                    "mixHash" : "0x354ed182ccb27beceed0abb72d95548735862f6dbd0e9a2f4960d36f92423652",
+                    "nonce" : "0x3b9f8ca4ca0488e4",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231",
+                    "stateRoot" : "0xd1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a021009d7b0fc7f905da8d4186f4773c3b88b9207542646ee6b134c53dbd8e69358810833a2806ab5ef0f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a04d7974ec87c5ae4be67f0cacc8f451e3df639c2169866b12a7e839475d38844ea0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a0354ed182ccb27beceed0abb72d95548735862f6dbd0e9a2f4960d36f92423652883b9f8ca4ca0488e4f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca06598d830213b870de2f4950d037240d7480e9afc3a9a535513e4deb94d736054a064dfe2c6415b9103845507ac045a6978ff7190e8dc212665436633faae6d53eac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f2fc93c41aa03ca765577e9ca2947eb8eb76ba8fdf5d7c25db7124f238e6986",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x62799947cadef222062ffed18b10dcd87512cf0d10b274cfed5cfa475b53f8ef",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f6aef6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a761510a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json
index 9eb6aa286..64b78ca56 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_1_0_25000_d0g0v0_EIP150" : {
+    "modexp_0_1_0_25000_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/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x7bdaa96563d889a04d184e3bc2542c959d9993815ad8f6f8d048913b7113a7d8",
-                    "mixHash" : "0x10078b64e5b8b1a09d4fe22e7b62107f4b482de6089d3321561521d39954e175",
-                    "nonce" : "0x11dc93bf590cd52e",
+                    "hash" : "0x0941410dcb5b02eb79ad7b08ca7b625423cd9e9a5aeaac38709b9a74db6713be",
+                    "mixHash" : "0x0c39e8bf8d3957bfb4bc8f39ca15c855a484a83c66bd88551b0b1243a05d4ae4",
+                    "nonce" : "0x0dd4a539f00adce9",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a010078b64e5b8b1a09d4fe22e7b62107f4b482de6089d3321561521d39954e1758811dc93bf590cd52ef90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a00c39e8bf8d3957bfb4bc8f39ca15c855a484a83c66bd88551b0b1243a05d4ae4880dd4a539f00adce9f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bdaa96563d889a04d184e3bc2542c959d9993815ad8f6f8d048913b7113a7d8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0941410dcb5b02eb79ad7b08ca7b625423cd9e9a5aeaac38709b9a74db6713be",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_1_0_25000_d0g0v0_EIP158" : {
+    "modexp_0_1_0_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xa3f0765244e7c8fd129a3b31986e21e101738db078453522f768eb34020c3acd",
+                    "mixHash" : "0xf3e86c2078b546e545a02967b30b57f5d8cdb1936f5b7b427d93609af872b59e",
+                    "nonce" : "0xe58cf18a0d68f3b6",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f3e86c2078b546e545a02967b30b57f5d8cdb1936f5b7b427d93609af872b59e88e58cf18a0d68f3b6f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb8c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3f",
+                        "s" : "0x18b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa3f0765244e7c8fd129a3b31986e21e101738db078453522f768eb34020c3acd",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_1_0_25000_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/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xdbff705deb6af157fb541cb343dddf6aa94804adbda9155f20cad6043159603b",
-                    "mixHash" : "0x199466aee8b4d4f3e42c9216303213f45aef73fbf2cb1d119155a98d9de98a12",
-                    "nonce" : "0x7e9c2946adc2b53e",
+                    "hash" : "0x209432cea3aef822ce12d3ae1c8b59ed41bfee607f51c814936d56b518c797e6",
+                    "mixHash" : "0xf76216e25cf50af856dd232d224df46afca89c6945d4524c7d29cae550b47030",
+                    "nonce" : "0x29aa179670ea23ab",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0199466aee8b4d4f3e42c9216303213f45aef73fbf2cb1d119155a98d9de98a12887e9c2946adc2b53ef90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f76216e25cf50af856dd232d224df46afca89c6945d4524c7d29cae550b470308829aa179670ea23abf90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbff705deb6af157fb541cb343dddf6aa94804adbda9155f20cad6043159603b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x209432cea3aef822ce12d3ae1c8b59ed41bfee607f51c814936d56b518c797e6",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_1_0_25000_d0g0v0_Frontier" : {
+    "modexp_0_1_0_25000_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/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb8c0",
-                    "hash" : "0xd18a880dde1289d59b86969339a4a7f9f4da862c99d5f41eaee23616f8921e88",
-                    "mixHash" : "0xa9b76e09feed5c904eea79788a985cc71fbde45e52e3a005621619df4fe2cc84",
-                    "nonce" : "0x9facf1aaa5ee07ad",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x3bb396bd30a8c676822c6bf461da57413cd0b38c7fe22ce772f20f25ddd71e3a",
+                    "mixHash" : "0xa5e28400e9ae5dbef3701133e93c193badc31b148ee228f096d89853444779a7",
+                    "nonce" : "0x622eb44059cf867e",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x96add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18af",
-                    "stateRoot" : "0x327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a0a9b76e09feed5c904eea79788a985cc71fbde45e52e3a005621619df4fe2cc84889facf1aaa5ee07adf90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0a5e28400e9ae5dbef3701133e93c193badc31b148ee228f096d89853444779a788622eb44059cf867ef90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd18a880dde1289d59b86969339a4a7f9f4da862c99d5f41eaee23616f8921e88",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3bb396bd30a8c676822c6bf461da57413cd0b38c7fe22ce772f20f25ddd71e3a",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6baae",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614552",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_1_0_25000_d0g0v0_Homestead" : {
+    "modexp_0_1_0_25000_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/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb8c0",
-                    "hash" : "0xac7874bd691c29ac5400c729c1f576c4d5720727fb606772a04ece1107fcb035",
-                    "mixHash" : "0x2460a543a57ec260e1bf8170242299bcd4f57dcf2a75ddafa8cd10c8a43b8953",
-                    "nonce" : "0xa74b9b8a419fc83b",
+                    "hash" : "0x5694d6b3a1f0c36163fa4c77243f6ab847a7cf08142951cb5d9c4da699a8ad72",
+                    "mixHash" : "0x5d222c3ef3ef41eb4c308200cada8f129fec9bf3c256141cc3c8936a762ee882",
+                    "nonce" : "0x50dd9c85ffe613ba",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x96add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18af",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a02460a543a57ec260e1bf8170242299bcd4f57dcf2a75ddafa8cd10c8a43b895388a74b9b8a419fc83bf90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a05d222c3ef3ef41eb4c308200cada8f129fec9bf3c256141cc3c8936a762ee8828850dd9c85ffe613baf90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac7874bd691c29ac5400c729c1f576c4d5720727fb606772a04ece1107fcb035",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5694d6b3a1f0c36163fa4c77243f6ab847a7cf08142951cb5d9c4da699a8ad72",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_1_0_25000_d0g0v0_Metropolis" : {
+    "modexp_0_1_0_25000_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/stPreCompiledContracts/modexp_0_1_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x79ed3366a5ead5aaae910846e24378bb9a2a59a3fdab80ea7e761ca0a89c08e4",
-                    "mixHash" : "0xd60a6a2b6788cc98e014498795e88dcf04866ecd1724d011fc29fa592c0e8f16",
-                    "nonce" : "0xa75ac26646ac1e74",
+                    "gasUsed" : "0xb8c0",
+                    "hash" : "0x74039f3b7551bf6c7a5fcef07d541d47e95859f2c402eae6323387abb6a592ed",
+                    "mixHash" : "0x6bf2ff1bbc2e427b25680a566168190aeb503d28501871ea853c1410a0aac665",
+                    "nonce" : "0x1b1e5888323ba4de",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x96add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18af",
+                    "stateRoot" : "0x327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x23a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0d60a6a2b6788cc98e014498795e88dcf04866ecd1724d011fc29fa592c0e8f1688a75ac26646ac1e74f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a023a9489fb941fcac123c38a55fea5a29ef8301efe870572733404e58f7f2867ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a06bf2ff1bbc2e427b25680a566168190aeb503d28501871ea853c1410a0aac665881b1e5888323ba4def90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba01e4b577d19e54db4cd30ebf6cbac387cbeed2478f2293f4c7f1c2604873f3b3fa018b015910d828e809b4463529bb55f0deb5f23b4a1f992642f7e4b1102f1eb8bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79ed3366a5ead5aaae910846e24378bb9a2a59a3fdab80ea7e761ca0a89c08e4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x74039f3b7551bf6c7a5fcef07d541d47e95859f2c402eae6323387abb6a592ed",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f6baae",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a7614552",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json
index c0ef787d2..fbf023679 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_1_0_35000_d0g0v0_EIP150" : {
+    "modexp_0_1_0_35000_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/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x3ffdfed7d6bc7a9e5163a3b88954dad01bc31da37eab88457a1ab265ed980e1d",
-                    "mixHash" : "0xc3c924301d65257ff544d8b2aa3896d92d67b9ca36fe25284ffb8f6e71d389ae",
-                    "nonce" : "0xfde433fe55490f76",
+                    "hash" : "0xd7f862dad1a3210795aaa8c446c9ffd0c5b3e2204b094d7dc18fbee66bb603fe",
+                    "mixHash" : "0x78fbe4dc1884ee6a28c915656534b99218001769f95dea7ea02183d02725eda4",
+                    "nonce" : "0x1b6093965587d95c",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c3c924301d65257ff544d8b2aa3896d92d67b9ca36fe25284ffb8f6e71d389ae88fde433fe55490f76f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a078fbe4dc1884ee6a28c915656534b99218001769f95dea7ea02183d02725eda4881b6093965587d95cf90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ffdfed7d6bc7a9e5163a3b88954dad01bc31da37eab88457a1ab265ed980e1d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd7f862dad1a3210795aaa8c446c9ffd0c5b3e2204b094d7dc18fbee66bb603fe",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_1_0_35000_d0g0v0_EIP158" : {
+    "modexp_0_1_0_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x43cd87fd5719af536a9c5836bc05297a44c0df2b616d8fb2676b458a645d4b26",
+                    "mixHash" : "0xf981474c949c6f7f216fd494c03cd6526f1b8756eaabda8dd6c84d276262df7e",
+                    "nonce" : "0xf2a54a5589f926b9",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f981474c949c6f7f216fd494c03cd6526f1b8756eaabda8dd6c84d276262df7e88f2a54a5589f926b9f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xdfd0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43f",
+                        "s" : "0x6cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x43cd87fd5719af536a9c5836bc05297a44c0df2b616d8fb2676b458a645d4b26",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_1_0_35000_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/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xa04c58d7570d94df6401ea29dcc60cfa8c9e1a5217a4c877ec83c38e542627a6",
-                    "mixHash" : "0xe524bb5147e9f8ac1e1303a7154a80323ddf8c1bf4e5932b692e1fe55486a4da",
-                    "nonce" : "0x7bea7cc8eeb005af",
+                    "hash" : "0xd3261217cc31ef5923a6fb54c8d11d0570ff77e4df0aa663caea3f7781c5fddb",
+                    "mixHash" : "0xa60716bf68bf456c7808d6aaad5004ed5bc14015f291c24d3a990815be75bcca",
+                    "nonce" : "0xdb68f19f19fe93d3",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e524bb5147e9f8ac1e1303a7154a80323ddf8c1bf4e5932b692e1fe55486a4da887bea7cc8eeb005aff90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0a60716bf68bf456c7808d6aaad5004ed5bc14015f291c24d3a990815be75bcca88db68f19f19fe93d3f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa04c58d7570d94df6401ea29dcc60cfa8c9e1a5217a4c877ec83c38e542627a6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd3261217cc31ef5923a6fb54c8d11d0570ff77e4df0aa663caea3f7781c5fddb",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_1_0_35000_d0g0v0_Frontier" : {
+    "modexp_0_1_0_35000_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/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xdfd0",
-                    "hash" : "0xf64c3c29c6b9ae49443c0bbe6c563abc65cfa3d8a85ef7de4892738e9a2beff0",
-                    "mixHash" : "0x1bfeced176c0d4bebee6750ca01681c4263a16a5d9a123cba5df968a9ba37547",
-                    "nonce" : "0x56280a9cf30851a3",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xa4c999f924b47859fe07d0e87d771c8dde5fe93bb3d0500db5bfb2ff6bc042e5",
+                    "mixHash" : "0x7bc832df193a0a52c857fbec66f155fa4fa206a715b4393014c9d4e6379641dc",
+                    "nonce" : "0x3dff0cd9af70938a",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x24129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17",
-                    "stateRoot" : "0x5c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a01bfeced176c0d4bebee6750ca01681c4263a16a5d9a123cba5df968a9ba375478856280a9cf30851a3f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07bc832df193a0a52c857fbec66f155fa4fa206a715b4393014c9d4e6379641dc883dff0cd9af70938af90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf64c3c29c6b9ae49443c0bbe6c563abc65cfa3d8a85ef7de4892738e9a2beff0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa4c999f924b47859fe07d0e87d771c8dde5fe93bb3d0500db5bfb2ff6bc042e5",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e1be",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611e42",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_1_0_35000_d0g0v0_Homestead" : {
+    "modexp_0_1_0_35000_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/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xdfd0",
-                    "hash" : "0x769f07c2d1e0435419e7e870ce682265e22136630e16bc4305fe14f54f8a8e73",
-                    "mixHash" : "0x530122c86dcdfd403acb22b86d2b37c2a2c1cb477902ff955b2b001c67828ad7",
-                    "nonce" : "0x9ae26e1c0e520e7e",
+                    "hash" : "0x1ccdb87a77343bf64e7e2af612187e4de94b55ccb958ddf7e24778af7b2a5868",
+                    "mixHash" : "0xe8f66491a285dda438f44b3f5ab71481137b3e81bff74cd529cfa52f6e02818b",
+                    "nonce" : "0xf169f0497339591d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x24129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a0530122c86dcdfd403acb22b86d2b37c2a2c1cb477902ff955b2b001c67828ad7889ae26e1c0e520e7ef90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a0e8f66491a285dda438f44b3f5ab71481137b3e81bff74cd529cfa52f6e02818b88f169f0497339591df90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x769f07c2d1e0435419e7e870ce682265e22136630e16bc4305fe14f54f8a8e73",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1ccdb87a77343bf64e7e2af612187e4de94b55ccb958ddf7e24778af7b2a5868",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_1_0_35000_d0g0v0_Metropolis" : {
+    "modexp_0_1_0_35000_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/stPreCompiledContracts/modexp_0_1_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x757a830e0d4502006eb1da45b54975e1e39fed50cf038224c3883eccb579c4ea",
-                    "mixHash" : "0x7ee4d5a36773c41046b9d58c638794165a0b02f986f35a7fec1a506aad5bbef1",
-                    "nonce" : "0xb27ab1773a0bf2f4",
+                    "gasUsed" : "0xdfd0",
+                    "hash" : "0xce4c667fbf3fa1d76bc6a1cbb0be1e73fff679f42a3b0f1f939cf855ca2c18ab",
+                    "mixHash" : "0x331e06934a29f7f8f4876c82c06ed42bdf6a18399a6b8d42037c65363d0a29ea",
+                    "nonce" : "0x0bd9a9e645b4b5d8",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x24129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17",
+                    "stateRoot" : "0x5c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x49bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07ee4d5a36773c41046b9d58c638794165a0b02f986f35a7fec1a506aad5bbef188b27ab1773a0bf2f4f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a049bfacb0445276c08512f342b0ecf705ff994ac45bd33b589fe73522f3b0039ba024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a0331e06934a29f7f8f4876c82c06ed42bdf6a18399a6b8d42037c65363d0a29ea880bd9a9e645b4b5d8f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0c9505d33f43a01a90e2b50fb85e8c37e81b814b53228d9a21948f7a2e7e8c43fa06cdba528bf52eb6854f5427f0f4984b781c13dba1e31820955c499991e119cb6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x757a830e0d4502006eb1da45b54975e1e39fed50cf038224c3883eccb579c4ea",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xce4c667fbf3fa1d76bc6a1cbb0be1e73fff679f42a3b0f1f939cf855ca2c18ab",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f6e1be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a7611e42",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json
index 6828b0289..65d472769 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_3_100_1000000_d0g0v0_EIP150" : {
+    "modexp_0_3_100_1000000_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/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x7cb8ca3eb827f925f94fe197a5a819ed7a0d3f85bcba9ace9bb3bc441b8ec4e0",
-                    "mixHash" : "0xddd12eb59e02e0a3460172dae33b500be510bb80f3b51d87e6fc9c5d19cbf18a",
-                    "nonce" : "0x203fbefb857ed902",
+                    "hash" : "0x8e54ac99d9c4163a05b29cf5ad4c26eeb5a7d6d61a82ae5ae353512bed8c61d7",
+                    "mixHash" : "0x79ab5f01d9d9034a985f3d380398baf690f8b29e976f7354eda5bf8cef5c0fb9",
+                    "nonce" : "0x9ffb71a69c35ca6a",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ddd12eb59e02e0a3460172dae33b500be510bb80f3b51d87e6fc9c5d19cbf18a88203fbefb857ed902f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a079ab5f01d9d9034a985f3d380398baf690f8b29e976f7354eda5bf8cef5c0fb9889ffb71a69c35ca6af90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cb8ca3eb827f925f94fe197a5a819ed7a0d3f85bcba9ace9bb3bc441b8ec4e0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8e54ac99d9c4163a05b29cf5ad4c26eeb5a7d6d61a82ae5ae353512bed8c61d7",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_3_100_1000000_d0g0v0_EIP158" : {
+    "modexp_0_3_100_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x2d960f4c5c57aaf267d089cfbebca9c3b8153d6fa141e833d09a2218b969f887",
+                    "mixHash" : "0x99c2778891903a59d20700f85b3cfca5494b4de73ff67360490948b0bf7fe199",
+                    "nonce" : "0xadc65c11cb06aac1",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a099c2778891903a59d20700f85b3cfca5494b4de73ff67360490948b0bf7fe19988adc65c11cb06aac1f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f99d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x05e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0c",
+                        "s" : "0x14bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2d960f4c5c57aaf267d089cfbebca9c3b8153d6fa141e833d09a2218b969f887",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_3_100_1000000_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/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x81f4a0d4ca1767964f80b01b4cba4c7f093d6f28857955a166d80ab625e3ad3a",
-                    "mixHash" : "0xfc4da2b4d629ad48d3a5ba96e7ca21d11b6d06ed9c52643a9f4197fcd54f729a",
-                    "nonce" : "0xcd1b452601fdf458",
+                    "hash" : "0x0dee3127d65180932f8c7488f224ae9c54c920344d74318b9fd1828500ee0a0d",
+                    "mixHash" : "0xba9ebfe7ec90d3295f3669ba6b6756fc6cbcf820813216f7e6a559a3d7dc16f2",
+                    "nonce" : "0x280fc915ed8cd122",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0fc4da2b4d629ad48d3a5ba96e7ca21d11b6d06ed9c52643a9f4197fcd54f729a88cd1b452601fdf458f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ba9ebfe7ec90d3295f3669ba6b6756fc6cbcf820813216f7e6a559a3d7dc16f288280fc915ed8cd122f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81f4a0d4ca1767964f80b01b4cba4c7f093d6f28857955a166d80ab625e3ad3a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0dee3127d65180932f8c7488f224ae9c54c920344d74318b9fd1828500ee0a0d",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_3_100_1000000_d0g0v0_Frontier" : {
+    "modexp_0_3_100_1000000_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/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f99d8",
-                    "hash" : "0x805e6b2ad6581f066cca2eca0052865b4971a5bd316f8442477b9b0abf00908a",
-                    "mixHash" : "0x5f5c71610e784bae25d67fc2b01d1dc76c7fc1f711fd99cf2b23c211fd9cfb81",
-                    "nonce" : "0x9f84e8ed3ebb5793",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x64807f5243565ce65fc45a14ecdf7f93c4f0ed2c016292fae2d7303d6585ffd4",
+                    "mixHash" : "0xb40f5a314acafed357bb42b5c73b66ea976c5c2e56b6d2e049655bf5638e0a9c",
+                    "nonce" : "0x9070b0625ae06a89",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x3e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97e",
-                    "stateRoot" : "0x628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a05f5c71610e784bae25d67fc2b01d1dc76c7fc1f711fd99cf2b23c211fd9cfb81889f84e8ed3ebb5793f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b40f5a314acafed357bb42b5c73b66ea976c5c2e56b6d2e049655bf5638e0a9c889070b0625ae06a89f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x805e6b2ad6581f066cca2eca0052865b4971a5bd316f8442477b9b0abf00908a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x64807f5243565ce65fc45a14ecdf7f93c4f0ed2c016292fae2d7303d6585ffd4",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059bc6",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a752643a",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_3_100_1000000_d0g0v0_Homestead" : {
+    "modexp_0_3_100_1000000_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/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f99d8",
-                    "hash" : "0xf1b2ab57f357ddcc1f5493787e89740c7ab259abf3bd0612f74a0bc8f108ab8e",
-                    "mixHash" : "0x319f61cf018a7cf8584fb3615f9b28ab91684b843f6076a91bbd724202026dd9",
-                    "nonce" : "0xaf7f15a30522c804",
+                    "hash" : "0xb372120b801c37943ced816457cc23d17eff861f2980854e851faa07ee4e0233",
+                    "mixHash" : "0x92097f797dedbacdd595ec20038f162182f81fbca78e8c6bcba1f563dd1645f3",
+                    "nonce" : "0xf5a0033bf78dbb96",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x3e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97e",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a0319f61cf018a7cf8584fb3615f9b28ab91684b843f6076a91bbd724202026dd988af7f15a30522c804f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a092097f797dedbacdd595ec20038f162182f81fbca78e8c6bcba1f563dd1645f388f5a0033bf78dbb96f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1b2ab57f357ddcc1f5493787e89740c7ab259abf3bd0612f74a0bc8f108ab8e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb372120b801c37943ced816457cc23d17eff861f2980854e851faa07ee4e0233",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_3_100_1000000_d0g0v0_Metropolis" : {
+    "modexp_0_3_100_1000000_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/stPreCompiledContracts/modexp_0_3_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0xcb76c8f6e7acedb7f66fdcf3c0db453f1e355058cd5cc817beb740411c7c7100",
-                    "mixHash" : "0x873f07a10e88be9995d657d4434419961322a073a0c119a258425be1e224d2c4",
-                    "nonce" : "0x5ae4b31a0d5e5f6a",
+                    "gasUsed" : "0x0f99d8",
+                    "hash" : "0xb1a5c1207e746c2a945e3c9bf0630b59df324cd3b3df8bda5e932e5351b49a6d",
+                    "mixHash" : "0xd026fa9c481fc64e25187274a0b466144aa867cc286396a36c9b677c87fd49cd",
+                    "nonce" : "0x6bd42d6a3a0aa59f",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x3e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97e",
+                    "stateRoot" : "0x628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0873f07a10e88be9995d657d4434419961322a073a0c119a258425be1e224d2c4885ae4b31a0d5e5f6af90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0c87adc496dda3baf0ab32d5a23201e458785d5ddd90b537a659efa4903c30390a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a0d026fa9c481fc64e25187274a0b466144aa867cc286396a36c9b677c87fd49cd886bd42d6a3a0aa59ff90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca005e9309df45a60f0e4afb73e18d9c98884087a8acc42f498041cdd325e061e0ca014bcd692e975b3b29a890daaec09101beac5ff23bdb8a65f979914470742ae5dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb76c8f6e7acedb7f66fdcf3c0db453f1e355058cd5cc817beb740411c7c7100",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb1a5c1207e746c2a945e3c9bf0630b59df324cd3b3df8bda5e932e5351b49a6d",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918245059bc6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a752643a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json
index 1f5cb26ad..22ff0932f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_3_100_155000_d0g0v0_EIP150" : {
+    "modexp_0_3_100_155000_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/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xe439ab4450b726529e9f7a1d0de6ece312c1b195e233715bcd673be9a70e81ba",
-                    "mixHash" : "0xfab302574394a6ebf812d89f1bf298f101acf9be888eb2c2794ff50f5efcea3b",
-                    "nonce" : "0x4436ec616add0cdb",
+                    "hash" : "0xfc90d458f21c4d690672328f08d7575c5f392b80c4ca3737e9d865435b2fe617",
+                    "mixHash" : "0x20ec26b3b8a75d920ab5f6f685fb2a755a81ebb957146db6c41f9d09dd3c7798",
+                    "nonce" : "0xe84010f1a9376117",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0fab302574394a6ebf812d89f1bf298f101acf9be888eb2c2794ff50f5efcea3b884436ec616add0cdbf90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a020ec26b3b8a75d920ab5f6f685fb2a755a81ebb957146db6c41f9d09dd3c779888e84010f1a9376117f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe439ab4450b726529e9f7a1d0de6ece312c1b195e233715bcd673be9a70e81ba",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfc90d458f21c4d690672328f08d7575c5f392b80c4ca3737e9d865435b2fe617",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_3_100_155000_d0g0v0_EIP158" : {
+    "modexp_0_3_100_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xab91bd4cb6e0e69fb1f1f51283904a059d9f3f8e51fc1ac07b72bc20830248e2",
+                    "mixHash" : "0xcc0059664d858510192866ce58ce42eff7a475645a2a52fca47931ce98d6a093",
+                    "nonce" : "0x67407bf6c45fe5ee",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0cc0059664d858510192866ce58ce42eff7a475645a2a52fca47931ce98d6a0938867407bf6c45fe5eef90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b510",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x70ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7",
+                        "s" : "0x5a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xab91bd4cb6e0e69fb1f1f51283904a059d9f3f8e51fc1ac07b72bc20830248e2",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_3_100_155000_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/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xcb29b82d93d2c4292032cdb894e8c6c313fbfe9a22e1504738763d00f920ff33",
-                    "mixHash" : "0x9063df15765c015aff0cb727d34ca5dfb473511ed3bf574310babfe270d682ad",
-                    "nonce" : "0xd6b7128a745f6a72",
+                    "hash" : "0xd6a68de3ee381d22143e75e58d6aba4eca3db256c4618b5b18c5f077c7a918ad",
+                    "mixHash" : "0x05aec909f2bc69aa356068549012d4ce14378a2e04aeb676d5868f7afeff43e6",
+                    "nonce" : "0xf28fc8fd8438daa9",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a09063df15765c015aff0cb727d34ca5dfb473511ed3bf574310babfe270d682ad88d6b7128a745f6a72f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a005aec909f2bc69aa356068549012d4ce14378a2e04aeb676d5868f7afeff43e688f28fc8fd8438daa9f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb29b82d93d2c4292032cdb894e8c6c313fbfe9a22e1504738763d00f920ff33",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd6a68de3ee381d22143e75e58d6aba4eca3db256c4618b5b18c5f077c7a918ad",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_3_100_155000_d0g0v0_Frontier" : {
+    "modexp_0_3_100_155000_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/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b510",
-                    "hash" : "0xe003ee1fd7c7585b4376872f530285a7ed39b0ef8caf3efcc6f90da0703cffb8",
-                    "mixHash" : "0x5622f5190ec015a86ed3133d25a3576e22e3218c34c7c64a85962d7deb2f1b91",
-                    "nonce" : "0x2a994cf1dac8f6f4",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x0f9ded6146ed82e546436a230c3d823eeb8138f315facab6d3da584aa1883464",
+                    "mixHash" : "0x08c3960c79045fba19074ba8fb6a67a809e4d60dc715f17c43376713aeba2091",
+                    "nonce" : "0x7b00a3a33d03d96c",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x2c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039e",
-                    "stateRoot" : "0x01376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421ada",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a05622f5190ec015a86ed3133d25a3576e22e3218c34c7c64a85962d7deb2f1b91882a994cf1dac8f6f4f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a008c3960c79045fba19074ba8fb6a67a809e4d60dc715f17c43376713aeba2091887b00a3a33d03d96cf90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe003ee1fd7c7585b4376872f530285a7ed39b0ef8caf3efcc6f90da0703cffb8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0f9ded6146ed82e546436a230c3d823eeb8138f315facab6d3da584aa1883464",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b6fe",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4902",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_3_100_155000_d0g0v0_Homestead" : {
+    "modexp_0_3_100_155000_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/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b510",
-                    "hash" : "0x55be0e5b714b55be1e80d04f0245d0741d1c248ea27ec9d895d70de9a3e6499c",
-                    "mixHash" : "0x82cfdeb63824e4690261266674aeec0110fffc618c894aab7e8842bc2c61a981",
-                    "nonce" : "0x430e24c91fafcfc2",
+                    "hash" : "0xc9e74aa9e0fbe537d5d17a500e7a54a6559a80fc6c622ab78217db8438af6330",
+                    "mixHash" : "0x437a94ddcb6309c77c5f0bf75eda2f501ccef1d6ee0d9c321829899f3bb93148",
+                    "nonce" : "0x12c3b543921823ee",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x2c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039e",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a082cfdeb63824e4690261266674aeec0110fffc618c894aab7e8842bc2c61a98188430e24c91fafcfc2f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a0437a94ddcb6309c77c5f0bf75eda2f501ccef1d6ee0d9c321829899f3bb931488812c3b543921823eef90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55be0e5b714b55be1e80d04f0245d0741d1c248ea27ec9d895d70de9a3e6499c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc9e74aa9e0fbe537d5d17a500e7a54a6559a80fc6c622ab78217db8438af6330",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_3_100_155000_d0g0v0_Metropolis" : {
+    "modexp_0_3_100_155000_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/stPreCompiledContracts/modexp_0_3_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0x05a4f10371b254657920a39a483a7ff1f7c8fed9c93159e20c9630331a60e949",
-                    "mixHash" : "0xb636854a8d0be48f4fcfb82b92b7361361508d6c71167eddad6ac06fcc68be9f",
-                    "nonce" : "0x675fd6ef62a44606",
+                    "gasUsed" : "0x02b510",
+                    "hash" : "0x6f4a83d5546480bba82579d2213eedec59cbaece70796503ef9579121b55fbdd",
+                    "mixHash" : "0xf63ce1a9d26b9317023bb2cb5a23a1044d85b0cba41c58058a7e736be741bd1a",
+                    "nonce" : "0x68916bc2a2602ef4",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x2c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039e",
+                    "stateRoot" : "0x01376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421ada",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b636854a8d0be48f4fcfb82b92b7361361508d6c71167eddad6ac06fcc68be9f88675fd6ef62a44606f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa0986f90683e8ac5532f375d7a521da0dfddbd0ad49e1fd7d1fe326e9de0590c15a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a0f63ce1a9d26b9317023bb2cb5a23a1044d85b0cba41c58058a7e736be741bd1a8868916bc2a2602ef4f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca070ca772cb93967017ffe7217d6a204420c8cb47720aab3bb26bf6dc61d340fc7a05a858ec0ff9758e9940b383b0eb08eda32b9725dad2f53fdcb1fbb37787cd68bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05a4f10371b254657920a39a483a7ff1f7c8fed9c93159e20c9630331a60e949",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6f4a83d5546480bba82579d2213eedec59cbaece70796503ef9579121b55fbdd",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f8b6fe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a75f4902",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json
index 816c39f96..ce54b848e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_3_100_20500_d0g0v0_EIP150" : {
+    "modexp_0_3_100_20500_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/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x75029f6385a99b5e75e6638cc62686248fc657084226ad5c5b542ac01082f2b3",
-                    "mixHash" : "0xd258684062745c073938e40e3ea6cc1f27658da86efd30bdba495ae04f51ec27",
-                    "nonce" : "0x2695af6d291a09f4",
+                    "hash" : "0x7388e41ad3ae48364de498bcc61f3c2955112b47e28ea3a5160649fc06883d29",
+                    "mixHash" : "0x81207d5874df6d24c44883e2872cc03d52e993a94a40ce4b6a711c33c377e24f",
+                    "nonce" : "0x3d1e9042eeb550af",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
-                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
+                    "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
+                    "stateRoot" : "0xb1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0d258684062745c073938e40e3ea6cc1f27658da86efd30bdba495ae04f51ec27882695af6d291a09f4f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7a0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a081207d5874df6d24c44883e2872cc03d52e993a94a40ce4b6a711c33c377e24f883d1e9042eeb550aff90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75029f6385a99b5e75e6638cc62686248fc657084226ad5c5b542ac01082f2b3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7388e41ad3ae48364de498bcc61f3c2955112b47e28ea3a5160649fc06883d29",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a99a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_0_3_100_20500_d0g0v0_EIP158" : {
+    "modexp_0_3_100_20500_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/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0xf95e95a9759666f0bd1cf159b73334f3898eceb9b4ed4b4de11add289b9dcf4c",
-                    "mixHash" : "0x03e794daa7ff1236879a78d1f3153276f3bb7416f3b0379c15012bab460b27bb",
-                    "nonce" : "0x82140f0e6968e041",
+                    "hash" : "0xc9e6a6272f3cf63e7583bd973eb39523fc1dd19ee38d7d653740f971e27df78c",
+                    "mixHash" : "0xa1633edf7974f83f14e7a08fbe66cb66f93b7cd49c84ff9bfca31ddc0f0a6c02",
+                    "nonce" : "0x730eee73f2fd860a",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
-                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
+                    "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
+                    "stateRoot" : "0xb1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a003e794daa7ff1236879a78d1f3153276f3bb7416f3b0379c15012bab460b27bb8882140f0e6968e041f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7a0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0a1633edf7974f83f14e7a08fbe66cb66f93b7cd49c84ff9bfca31ddc0f0a6c0288730eee73f2fd860af90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf95e95a9759666f0bd1cf159b73334f3898eceb9b4ed4b4de11add289b9dcf4c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc9e6a6272f3cf63e7583bd973eb39523fc1dd19ee38d7d653740f971e27df78c",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a99a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_0_3_100_20500_d0g0v0_Frontier" : {
+    "modexp_0_3_100_20500_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/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x0e7692f3f5825a54a82f98caec5cebf1d7e5b2cf5ab78574cde1ac239509e643",
-                    "mixHash" : "0x93e8153dfc7f2f1ce86450926e1ea8a2614b35a8c0f829f954b6c95975340a79",
-                    "nonce" : "0xb6cf704140ff7006",
+                    "hash" : "0x2c402486bb543d46e4f3ad055da51ef356536d5fbbc1fd5705f4d08ca40e8d04",
+                    "mixHash" : "0xa87876e50412b251306833f1f958fbe3fed8611f19a588e3bcf1373c40d6b174",
+                    "nonce" : "0x76a4797ab91f20c0",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a093e8153dfc7f2f1ce86450926e1ea8a2614b35a8c0f829f954b6c95975340a7988b6cf704140ff7006f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0a87876e50412b251306833f1f958fbe3fed8611f19a588e3bcf1373c40d6b1748876a4797ab91f20c0f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e7692f3f5825a54a82f98caec5cebf1d7e5b2cf5ab78574cde1ac239509e643",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2c402486bb543d46e4f3ad055da51ef356536d5fbbc1fd5705f4d08ca40e8d04",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_0_3_100_20500_d0g0v0_Homestead" : {
+    "modexp_0_3_100_20500_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/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x692d4d906fd0f8d3d13dd8eee0dcd57cbc80d770ea4aed7044090efc34129da8",
-                    "mixHash" : "0x9fcc4fd9849478bc1ab173d907aaa68e67a2405cfac2269deba2cb9f17fc8fbe",
-                    "nonce" : "0x24a730a94e131ec7",
+                    "hash" : "0x37d9215f13fe3f16b8ec295a05867bcb46d2b34558f1fea25d4185bde9ce1bc1",
+                    "mixHash" : "0xea9300da7c63803ed57ff749d511cbb8b4f0fef2bdefde2a3fc5cac044812d28",
+                    "nonce" : "0xca8d9dc5b6f17a97",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a09fcc4fd9849478bc1ab173d907aaa68e67a2405cfac2269deba2cb9f17fc8fbe8824a730a94e131ec7f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0ea9300da7c63803ed57ff749d511cbb8b4f0fef2bdefde2a3fc5cac044812d2888ca8d9dc5b6f17a97f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x692d4d906fd0f8d3d13dd8eee0dcd57cbc80d770ea4aed7044090efc34129da8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x37d9215f13fe3f16b8ec295a05867bcb46d2b34558f1fea25d4185bde9ce1bc1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_0_3_100_20500_d0g0v0_Metropolis" : {
+    "modexp_0_3_100_20500_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/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0xf928ea6c37d8adcba4c11cc9a51fd400e40a3f9a385f434a518b90c364bbfa13",
-                    "mixHash" : "0x12fb2ae40a99407131181aef80b4034d73c5ac6c9044f377a3d2147c7ce847ba",
-                    "nonce" : "0x1a74f3172bb7fd41",
+                    "hash" : "0x824340773419375e976a4bbb5716425ec1a8cbe4dc65213424c8d3e630bb3d6b",
+                    "mixHash" : "0x1b4a83f5f521aab88da9316ecad2c4efe370cb92d96392adc2e0ddc928d67c16",
+                    "nonce" : "0x4439b8204168f7e9",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
-                    "stateRoot" : "0xb1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7",
+                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
+                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7a0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a012fb2ae40a99407131181aef80b4034d73c5ac6c9044f377a3d2147c7ce847ba881a74f3172bb7fd41f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a01b4a83f5f521aab88da9316ecad2c4efe370cb92d96392adc2e0ddc928d67c16884439b8204168f7e9f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf928ea6c37d8adcba4c11cc9a51fd400e40a3f9a385f434a518b90c364bbfa13",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x824340773419375e976a4bbb5716425ec1a8cbe4dc65213424c8d3e630bb3d6b",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6a99a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615666",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_3_100_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_3_100_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa7ac",
+                    "hash" : "0x5bd134c7237baee40c945a4987de8355876e8b9ad0a071eced4d724f0e786edc",
+                    "mixHash" : "0x70363337014b6e8c53550387a64dcb88b811cb534c59d7455b7d26c130c9e19b",
+                    "nonce" : "0xfca958b04f93d37d",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
+                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea0769b76fdf6577cfc3cd56a0669ca3367c455d59683c0d856d24863d8d08fbb4ea08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a070363337014b6e8c53550387a64dcb88b811cb534c59d7455b7d26c130c9e19b88fca958b04f93d37df90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca0c58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3a0599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa7ac",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc58125c0a477f1d94c4d7c78a6354c7d44c547db7673e05659987966e36699a3",
+                        "s" : "0x599176c63de9da50fdc052f16aae3fb7c6daebf3b7678a824e834cf7943ee126",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5bd134c7237baee40c945a4987de8355876e8b9ad0a071eced4d724f0e786edc",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json
index fa81dbb7c..1675d5c1d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_3_100_22000_d0g0v0_EIP150" : {
+    "modexp_0_3_100_22000_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/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xf8f54e23a102defda55971b9a1d9410b912304f7cb33d0ec7ede4c0992ed7e31",
-                    "mixHash" : "0x45666758ef272762d345117cbaee5b5eae786c0a6dbe4526ff4bd79c3344dc7b",
-                    "nonce" : "0xf5447cb0c47ac33e",
+                    "hash" : "0xb5bb6fc3f874981883ecc0b16a017e8e00554cc3f6b97dedb213ac5f93f9af92",
+                    "mixHash" : "0x346f59112151dbfd6b9497f8b670a89d2494dc5de2e7d8872cd85b6839c570a6",
+                    "nonce" : "0x9e8f688ea6955f46",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a045666758ef272762d345117cbaee5b5eae786c0a6dbe4526ff4bd79c3344dc7b88f5447cb0c47ac33ef90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0346f59112151dbfd6b9497f8b670a89d2494dc5de2e7d8872cd85b6839c570a6889e8f688ea6955f46f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8f54e23a102defda55971b9a1d9410b912304f7cb33d0ec7ede4c0992ed7e31",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb5bb6fc3f874981883ecc0b16a017e8e00554cc3f6b97dedb213ac5f93f9af92",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_3_100_22000_d0g0v0_EIP158" : {
+    "modexp_0_3_100_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x5ab4717c399257f0552e2915155acab43e2840d98fc2e29d23533b1d9362e4eb",
+                    "mixHash" : "0x84c7df917205646fb1cdb03a728df1b08e1b414f9cb3e7ece319256835e9b8df",
+                    "nonce" : "0xcf4d461d724698f0",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a084c7df917205646fb1cdb03a728df1b08e1b414f9cb3e7ece319256835e9b8df88cf4d461d724698f0f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xad88",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898",
+                        "s" : "0x318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5ab4717c399257f0552e2915155acab43e2840d98fc2e29d23533b1d9362e4eb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_3_100_22000_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/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x2d79f35938aceff4b7dcbcc3d6e87a7d40b2f35a87d811c43d8042010629b97c",
-                    "mixHash" : "0x7ac719d6ec887b206952711815d235b9f230c68c079c3a6533689eba31b7bb3a",
-                    "nonce" : "0xe0769b3fc8a107ea",
+                    "hash" : "0x248488bb35fbe5afef8316d3d608eb460959910ca64b2e8b3bbb469ee6c02431",
+                    "mixHash" : "0xf7c77d75a82262f79675fdb9881d82f95c8bfb3e34553502cc063a343a521619",
+                    "nonce" : "0x217453c124da537f",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a07ac719d6ec887b206952711815d235b9f230c68c079c3a6533689eba31b7bb3a88e0769b3fc8a107eaf90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0f7c77d75a82262f79675fdb9881d82f95c8bfb3e34553502cc063a343a52161988217453c124da537ff90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d79f35938aceff4b7dcbcc3d6e87a7d40b2f35a87d811c43d8042010629b97c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x248488bb35fbe5afef8316d3d608eb460959910ca64b2e8b3bbb469ee6c02431",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_3_100_22000_d0g0v0_Frontier" : {
+    "modexp_0_3_100_22000_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/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad88",
-                    "hash" : "0xfd131616cd2d9e113cb40c8112ed6d4f7bdb412bf6019cb2bee291e346cc4887",
-                    "mixHash" : "0x36954f53ac18b36dfd539415b29297754cdbc4087c477abea5711a4f3d87185a",
-                    "nonce" : "0xc5c58a45e691271b",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x238ced39136bcc716b3a0df36b995a30381ce80e12b031635ff28e0ec39d9e9b",
+                    "mixHash" : "0xb340c1815beded906a8bbc1791392fdd7892ee6547b9a04c6572f4d76dad686c",
+                    "nonce" : "0x915010f7b00af217",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xaac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39",
-                    "stateRoot" : "0x1179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a036954f53ac18b36dfd539415b29297754cdbc4087c477abea5711a4f3d87185a88c5c58a45e691271bf90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b340c1815beded906a8bbc1791392fdd7892ee6547b9a04c6572f4d76dad686c88915010f7b00af217f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd131616cd2d9e113cb40c8112ed6d4f7bdb412bf6019cb2bee291e346cc4887",
-        "network" : "Frontier",
+        "lastblockhash" : "0x238ced39136bcc716b3a0df36b995a30381ce80e12b031635ff28e0ec39d9e9b",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af76",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761508a",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_3_100_22000_d0g0v0_Homestead" : {
+    "modexp_0_3_100_22000_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/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad88",
-                    "hash" : "0xc2ef275f7b989cd30904a33e3588d9aba22c96db70539b3cd0dcf78fb8be5b82",
-                    "mixHash" : "0x516162f24a7e7ed4205358cadf20dca81e537168a61ab14f37b8c48cc2fe0fa2",
-                    "nonce" : "0x685903bfba400df4",
+                    "hash" : "0xe95cf76224b79f8c6038319194280e3f880d5119587c6a2cede9a7673884a224",
+                    "mixHash" : "0x4ba22e3076ca6790177ed6c266005578f32f7f2cf1e5d674aa3264d50ea0713f",
+                    "nonce" : "0x669afc96cd206f0a",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xaac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a0516162f24a7e7ed4205358cadf20dca81e537168a61ab14f37b8c48cc2fe0fa288685903bfba400df4f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a04ba22e3076ca6790177ed6c266005578f32f7f2cf1e5d674aa3264d50ea0713f88669afc96cd206f0af90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2ef275f7b989cd30904a33e3588d9aba22c96db70539b3cd0dcf78fb8be5b82",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe95cf76224b79f8c6038319194280e3f880d5119587c6a2cede9a7673884a224",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_3_100_22000_d0g0v0_Metropolis" : {
+    "modexp_0_3_100_22000_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/stPreCompiledContracts/modexp_0_3_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0xf15b0103f3e1d89561d5c7ddf62fb3958d390fa0e67974dd5d459246bd6027a5",
-                    "mixHash" : "0x2ad1232a2b6fbe70d23517e6f35413cce885413c0fc79c91cea6770d7392dba7",
-                    "nonce" : "0xcc25cd42147d9046",
+                    "gasUsed" : "0xad88",
+                    "hash" : "0x61f9b5a3eddd8d6ddc3ce23d0f9ba967e4b7d7855036b073b1a65c18b7e64418",
+                    "mixHash" : "0xa4ee478c57f8fc9042b55055b36aeec2aee1531758057a2d0690b8a94f7d5914",
+                    "nonce" : "0xec1d89839df7b0d1",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0xaac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39",
+                    "stateRoot" : "0x1179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a02ad1232a2b6fbe70d23517e6f35413cce885413c0fc79c91cea6770d7392dba788cc25cd42147d9046f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a0190b8f664a95c278f41fbf2c9f93bc5738e79f829b3058a8b50ce5d038e3cf1da0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a0a4ee478c57f8fc9042b55055b36aeec2aee1531758057a2d0690b8a94f7d591488ec1d89839df7b0d1f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca02d43ea80e728930fd79c028f3ce4eab6f241eff3793ad73cfd1b601d036d8898a0318214eddbaca98a797778098fce1edf7865fc61ba384d1f5c6f3509cccde856c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf15b0103f3e1d89561d5c7ddf62fb3958d390fa0e67974dd5d459246bd6027a5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x61f9b5a3eddd8d6ddc3ce23d0f9ba967e4b7d7855036b073b1a65c18b7e64418",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f6af76",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a761508a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json
index 824673316..726560cd2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_3_100_25000_d0g0v0_EIP150" : {
+    "modexp_0_3_100_25000_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/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xb8e1cc28a56ed3ca6769ee409ca0c07b9e07c83895ff105c6c7465d2401df323",
-                    "mixHash" : "0x94a27a97883da75fdb6e46a137594837e38cbc1193e9fa32e8f589f2edabba84",
-                    "nonce" : "0xcb62fbac44cd507b",
+                    "hash" : "0x24aae4a3a03035a5c6104ff025e4aaf04030cd6dd212b54ee854ca682e4b851f",
+                    "mixHash" : "0x1e605849434b2cf931ef78f09a218145e79fc51f7453e42fe026ee04db7150c9",
+                    "nonce" : "0xd3110509962df506",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a094a27a97883da75fdb6e46a137594837e38cbc1193e9fa32e8f589f2edabba8488cb62fbac44cd507bf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a01e605849434b2cf931ef78f09a218145e79fc51f7453e42fe026ee04db7150c988d3110509962df506f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8e1cc28a56ed3ca6769ee409ca0c07b9e07c83895ff105c6c7465d2401df323",
-        "network" : "EIP150",
+        "lastblockhash" : "0x24aae4a3a03035a5c6104ff025e4aaf04030cd6dd212b54ee854ca682e4b851f",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_3_100_25000_d0g0v0_EIP158" : {
+    "modexp_0_3_100_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xeddfe3c7d5eeedfac520052e76201b04410b3eca03fc88bf81f8fa5f712fbd74",
+                    "mixHash" : "0x48630fdd041bac84166cc1ece09dfee01aceae499e03834b098fde340283129f",
+                    "nonce" : "0x2aef555066f7d5d2",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a048630fdd041bac84166cc1ece09dfee01aceae499e03834b098fde340283129f882aef555066f7d5d2f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb940",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084",
+                        "s" : "0x6a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeddfe3c7d5eeedfac520052e76201b04410b3eca03fc88bf81f8fa5f712fbd74",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_3_100_25000_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/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x8cb4c4d8c03db10a7d52113971332946f296621b63d6069d69b5542a405b2a2d",
-                    "mixHash" : "0x8c156a5527ed4e0e684b830dc3f1d9c05ad99b77bd29ce2a8ccd7e380c5bde25",
-                    "nonce" : "0x8a093126ba43ea7e",
+                    "hash" : "0x7ed51c60805a4dc37a4ca16bc45477a28c8059df82868d3b9fd22eb4f03c0736",
+                    "mixHash" : "0x8f64f29f32f64854fa6e41328996d2b615e3157c225135274a57db4d0e7441ac",
+                    "nonce" : "0x4f99da22a6f87c4b",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a08c156a5527ed4e0e684b830dc3f1d9c05ad99b77bd29ce2a8ccd7e380c5bde25888a093126ba43ea7ef90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a08f64f29f32f64854fa6e41328996d2b615e3157c225135274a57db4d0e7441ac884f99da22a6f87c4bf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8cb4c4d8c03db10a7d52113971332946f296621b63d6069d69b5542a405b2a2d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7ed51c60805a4dc37a4ca16bc45477a28c8059df82868d3b9fd22eb4f03c0736",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_3_100_25000_d0g0v0_Frontier" : {
+    "modexp_0_3_100_25000_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/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb940",
-                    "hash" : "0x3d5e65e12875a74403f0f259a92671f16fddf4be42fa6b87713aa09149388bd1",
-                    "mixHash" : "0x1c172f7ca7c1b371b264aa2b42589bf1bb43cc390ec00af42451c8fbe9414965",
-                    "nonce" : "0xcc8ba55735e9cf6f",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x64b9078123843b57507aca1a63738a2b30836b595d4ab11cb434a80da6f65bbe",
+                    "mixHash" : "0xbcbfde318a1947c4a91bedfac06d7c8db721c3f1773b697cd6a0d2230f50b790",
+                    "nonce" : "0xe68f40abe9f166ee",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x93314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdb",
-                    "stateRoot" : "0xcd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66f",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a01c172f7ca7c1b371b264aa2b42589bf1bb43cc390ec00af42451c8fbe941496588cc8ba55735e9cf6ff90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0bcbfde318a1947c4a91bedfac06d7c8db721c3f1773b697cd6a0d2230f50b79088e68f40abe9f166eef90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d5e65e12875a74403f0f259a92671f16fddf4be42fa6b87713aa09149388bd1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x64b9078123843b57507aca1a63738a2b30836b595d4ab11cb434a80da6f65bbe",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bb2e",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76144d2",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_3_100_25000_d0g0v0_Homestead" : {
+    "modexp_0_3_100_25000_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/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb940",
-                    "hash" : "0x126fcd063b6b111589d3d720de300ea695c79e6bb4132c32f8f3ebe945baf873",
-                    "mixHash" : "0x1cb76a3353255f2306db11b6065758c3b03ba9a198f433632cfaa02675633927",
-                    "nonce" : "0xef7f8576189bf978",
+                    "hash" : "0x792e87cc8c0408288d1ba3ad73974eed2e387af5f03bb72709be1e68fe84d555",
+                    "mixHash" : "0x6f9e72dad82c72e35ae2adf3390abd80144a2450aede9faef2b56ab67497146c",
+                    "nonce" : "0x9c2889c6b52463bd",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x93314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdb",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a01cb76a3353255f2306db11b6065758c3b03ba9a198f433632cfaa0267563392788ef7f8576189bf978f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a06f9e72dad82c72e35ae2adf3390abd80144a2450aede9faef2b56ab67497146c889c2889c6b52463bdf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x126fcd063b6b111589d3d720de300ea695c79e6bb4132c32f8f3ebe945baf873",
-        "network" : "Homestead",
+        "lastblockhash" : "0x792e87cc8c0408288d1ba3ad73974eed2e387af5f03bb72709be1e68fe84d555",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_3_100_25000_d0g0v0_Metropolis" : {
+    "modexp_0_3_100_25000_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/stPreCompiledContracts/modexp_0_3_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0x350fecf4e90c2389a172dfa0d364571e562291e13b16f1a94295589641e45cab",
-                    "mixHash" : "0xb707b711e61d28d20f46066387e541024b942513aca52fd8d0b0e8e4efe2b160",
-                    "nonce" : "0xe4bc6f4d12216157",
+                    "gasUsed" : "0xb940",
+                    "hash" : "0x46df43305e07dc57f6577afe573ff57e7e7b226579949eeb485ca37d3419bed9",
+                    "mixHash" : "0x995316b2ebe952baf304a09db8f873d3690cd3afbb93c8b2cfed7d5e0bd863df",
+                    "nonce" : "0x4ad0a6ac54d8aa32",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x93314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdb",
+                    "stateRoot" : "0xcd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b707b711e61d28d20f46066387e541024b942513aca52fd8d0b0e8e4efe2b16088e4bc6f4d12216157f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa03895678d1bb8c733c3c44cc0fe0db781d32b253e2bc70e631bd5d034f7939697a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a0995316b2ebe952baf304a09db8f873d3690cd3afbb93c8b2cfed7d5e0bd863df884ad0a6ac54d8aa32f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ba0e29cd1325b3d357e4bdf23a619308cd61fc332b14325ca39819d3ae697b97084a06a5a5dd588953736548bdc1e4441fd9deecfcbba0e34cf4243befc4d33a89717c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x350fecf4e90c2389a172dfa0d364571e562291e13b16f1a94295589641e45cab",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x46df43305e07dc57f6577afe573ff57e7e7b226579949eeb485ca37d3419bed9",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f6bb2e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a76144d2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json
index f462ccd8d..78abbea10 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_0_3_100_35000_d0g0v0_EIP150" : {
+    "modexp_0_3_100_35000_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/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x08dfdc42265a6921781a2defeb225b9099ec1d4facce6fa6f6dd80e5a5d561c8",
-                    "mixHash" : "0xd9292068ae5f5d3a5a5f14a802e3b5bc383bf1e3a0541fe1201165e97804011d",
-                    "nonce" : "0xe56481079975a60d",
+                    "hash" : "0x83d3a8fa9a6042ad39008c1e49417821685e7ce06234b0806a694eabbbea55e7",
+                    "mixHash" : "0x1f7847292d7544733c3b4bddc2f8550118c299c236cc72fcc7122177a3a4247b",
+                    "nonce" : "0x61def2102de87cb8",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0d9292068ae5f5d3a5a5f14a802e3b5bc383bf1e3a0541fe1201165e97804011d88e56481079975a60df90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a01f7847292d7544733c3b4bddc2f8550118c299c236cc72fcc7122177a3a4247b8861def2102de87cb8f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08dfdc42265a6921781a2defeb225b9099ec1d4facce6fa6f6dd80e5a5d561c8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x83d3a8fa9a6042ad39008c1e49417821685e7ce06234b0806a694eabbbea55e7",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_0_3_100_35000_d0g0v0_EIP158" : {
+    "modexp_0_3_100_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xc97dc31aa0eba400e3125c4b9b644efdb1ee24608c8e7997e189a3ba2acac190",
+                    "mixHash" : "0x13c11c819638efec739ace482b69e8a8e1d1a1907a36cf7bda9b544bf0e174cc",
+                    "nonce" : "0xae50193501443e71",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a013c11c819638efec739ace482b69e8a8e1d1a1907a36cf7bda9b544bf0e174cc88ae50193501443e71f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe050",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x52eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125",
+                        "s" : "0x21cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc97dc31aa0eba400e3125c4b9b644efdb1ee24608c8e7997e189a3ba2acac190",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_0_3_100_35000_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/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xb75ace230e9830176e10b195be86030e92386f20f28a689c486a29bf69a451c4",
-                    "mixHash" : "0x1a38f0f400fb3cdf9e8c67c485df3017faa983c7af1172cee5bc081e13c0a856",
-                    "nonce" : "0xa88b88212bc72164",
+                    "hash" : "0xcbc19ee1e4a2df43d7cc9fb1dd7260eefb4272d1ab4c28a01768c57ddfabaf21",
+                    "mixHash" : "0x9672d01928249cf0d989e09aa9f6def3158b0b813b55d50fef285ff4d7d7f09d",
+                    "nonce" : "0x384ec3b1ef52e728",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a01a38f0f400fb3cdf9e8c67c485df3017faa983c7af1172cee5bc081e13c0a85688a88b88212bc72164f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a09672d01928249cf0d989e09aa9f6def3158b0b813b55d50fef285ff4d7d7f09d88384ec3b1ef52e728f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb75ace230e9830176e10b195be86030e92386f20f28a689c486a29bf69a451c4",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcbc19ee1e4a2df43d7cc9fb1dd7260eefb4272d1ab4c28a01768c57ddfabaf21",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_0_3_100_35000_d0g0v0_Frontier" : {
+    "modexp_0_3_100_35000_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/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe050",
-                    "hash" : "0xbc568a54847dcd68fd21348c77f2219f1f21180138c72fc99546f3496160d8eb",
-                    "mixHash" : "0x76b5d7e9433d8a7180c9ee69be57542b1077f5816d179ec05a92b01e0b169089",
-                    "nonce" : "0x501b2dc840a78e43",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x752902b990a76a463a07e3af66f7c66f1373c36f9b7c96fb9e64171c27904eb1",
+                    "mixHash" : "0x38dd5889fdbf16e6b32416938ea5d8cb39794a50177e8a9c34c1fc616e6b6ee8",
+                    "nonce" : "0x1430fea232538165",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x1b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9c",
-                    "stateRoot" : "0xc0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a076b5d7e9433d8a7180c9ee69be57542b1077f5816d179ec05a92b01e0b16908988501b2dc840a78e43f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a038dd5889fdbf16e6b32416938ea5d8cb39794a50177e8a9c34c1fc616e6b6ee8881430fea232538165f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc568a54847dcd68fd21348c77f2219f1f21180138c72fc99546f3496160d8eb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x752902b990a76a463a07e3af66f7c66f1373c36f9b7c96fb9e64171c27904eb1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e23e",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611dc2",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_0_3_100_35000_d0g0v0_Homestead" : {
+    "modexp_0_3_100_35000_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/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe050",
-                    "hash" : "0x336956815bbf23ed3130cd7bf0eeb211732fc99e2e2062b471c6b9770a7321c2",
-                    "mixHash" : "0x59bb20ec5ac65bd3d89fef99fc68413501525e5afcbb6bf9d5c62d1c0d4a2ae5",
-                    "nonce" : "0xa60a22a26691a65a",
+                    "hash" : "0xda6eda780b92c4f55d4d4587582421d2462ad2dd04c18b59d85a88ff46163f78",
+                    "mixHash" : "0x84704444082981fd361753d9840099bbf343bfdee245181c016a9b7819e8a4f6",
+                    "nonce" : "0xb1a851185cc29900",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x1b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9c",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a059bb20ec5ac65bd3d89fef99fc68413501525e5afcbb6bf9d5c62d1c0d4a2ae588a60a22a26691a65af90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a084704444082981fd361753d9840099bbf343bfdee245181c016a9b7819e8a4f688b1a851185cc29900f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x336956815bbf23ed3130cd7bf0eeb211732fc99e2e2062b471c6b9770a7321c2",
-        "network" : "Homestead",
+        "lastblockhash" : "0xda6eda780b92c4f55d4d4587582421d2462ad2dd04c18b59d85a88ff46163f78",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_0_3_100_35000_d0g0v0_Metropolis" : {
+    "modexp_0_3_100_35000_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/stPreCompiledContracts/modexp_0_3_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0x46f70e28a44bba87688f22d78bc2624df7a3bb5c50ee068d5b156a9213e20b6a",
-                    "mixHash" : "0xe69b0c8dd4f8ae2899873b34ff297fa2013996ab62b90f4a0386c842b7ecead0",
-                    "nonce" : "0x83686f8a4ae2b494",
+                    "gasUsed" : "0xe050",
+                    "hash" : "0x86f0aa6c7a169828670c59ad9ef927075553644bd9e3d445554dc00d02b50f7e",
+                    "mixHash" : "0xcbfff8f653ba503e4d97ff4a74cd91dc347af52337d475eb0ee784346e88e188",
+                    "nonce" : "0x2015f2893a274777",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x1b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9c",
+                    "stateRoot" : "0xc0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0e69b0c8dd4f8ae2899873b34ff297fa2013996ab62b90f4a0386c842b7ecead08883686f8a4ae2b494f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a0e39f596f763d6765d4e85071d495be214ec6248dabd550a8b07cdf2249f4f188a01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a0cbfff8f653ba503e4d97ff4a74cd91dc347af52337d475eb0ee784346e88e188882015f2893a274777f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103640000000000000000000000000000000000000000000000000000000000001ca052eaefe31c2e8deb4bb876ac374caa532350f3e3b041feeb2df93921d5aee125a021cd6084668acf2ef07077675cf8bd20c5c379f7e412638934aa3514baff7b32c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46f70e28a44bba87688f22d78bc2624df7a3bb5c50ee068d5b156a9213e20b6a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x86f0aa6c7a169828670c59ad9ef927075553644bd9e3d445554dc00d02b50f7e",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f6e23e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a7611dc2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json
index e88bcbacf..d0e8335a8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_0_1000000_d0g0v0_EIP150" : {
+    "modexp_1_0_0_1000000_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/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x135747d184381de73ff0420463d12a9d770a1a4337c2dddb9427660642ac0d63",
-                    "mixHash" : "0x4817a78e14a0432ef8169f509a8cda39a22e69e422404c288bf3479db96eccd0",
-                    "nonce" : "0x8529bbc2745e8e32",
+                    "hash" : "0x86ccceecb9d68a099c5fe278f43f9d172f750549df4240beeb7d9bb6965e3283",
+                    "mixHash" : "0x9117e996d04c793e550b53f6d4f63979ccf9fcc4f4ee606c046c1aa7839d47d7",
+                    "nonce" : "0xfd8ac103e765b94d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04817a78e14a0432ef8169f509a8cda39a22e69e422404c288bf3479db96eccd0888529bbc2745e8e32f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a09117e996d04c793e550b53f6d4f63979ccf9fcc4f4ee606c046c1aa7839d47d788fd8ac103e765b94df90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x135747d184381de73ff0420463d12a9d770a1a4337c2dddb9427660642ac0d63",
-        "network" : "EIP150",
+        "lastblockhash" : "0x86ccceecb9d68a099c5fe278f43f9d172f750549df4240beeb7d9bb6965e3283",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_0_1000000_d0g0v0_EIP158" : {
+    "modexp_1_0_0_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xee202b7273d6b8d534a38c5abf28cff34cc7b5f39407a1e7f03c4e45842ceeae",
+                    "mixHash" : "0x2d8d8cf841b83c92bb142f53154992a1146e32809acafc53cbe1df1080b12e66",
+                    "nonce" : "0x4484bd27550e537a",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a02d8d8cf841b83c92bb142f53154992a1146e32809acafc53cbe1df1080b12e66884484bd27550e537af90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9958",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fe",
+                        "s" : "0x30ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xee202b7273d6b8d534a38c5abf28cff34cc7b5f39407a1e7f03c4e45842ceeae",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_0_1000000_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/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xd84c8aa7d63457f7f86c33cf3d41bd2063e25d250b484c703a80eeb6aa16418e",
-                    "mixHash" : "0xe8d7807b5576c3d0d68452d9d60dd257ae1252a6050e92be64ccf1a1db4a3f24",
-                    "nonce" : "0x32cc38ba970f650b",
+                    "hash" : "0xe9502e452b4e9421348bb68b2848d8b103496e1b458c4474c527cfcd207293e4",
+                    "mixHash" : "0xc1f78a745dc202d73bbbf2e3f76727729cda9ac5c3f0d757e288974a8b291cd5",
+                    "nonce" : "0x0603e1955c08250f",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e8d7807b5576c3d0d68452d9d60dd257ae1252a6050e92be64ccf1a1db4a3f248832cc38ba970f650bf90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c1f78a745dc202d73bbbf2e3f76727729cda9ac5c3f0d757e288974a8b291cd5880603e1955c08250ff90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd84c8aa7d63457f7f86c33cf3d41bd2063e25d250b484c703a80eeb6aa16418e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe9502e452b4e9421348bb68b2848d8b103496e1b458c4474c527cfcd207293e4",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_0_1000000_d0g0v0_Frontier" : {
+    "modexp_1_0_0_1000000_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/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9958",
-                    "hash" : "0x9dbec8ac13076d8c0bcb72e6483a45f606fcaeb511f1396c1c15ec49f66a6738",
-                    "mixHash" : "0xbcd7480b157f292a78423340d5bd5ec42cd45f4e45efc6a56b2a2d8c7e7525e3",
-                    "nonce" : "0x3331bfb0b3e1de55",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x5b93e9fedf779bd4a11fddc73453e66b0da7dcccb8a6c883998096c8e49ad3b1",
+                    "mixHash" : "0x7bf0530bc6898172575bbea3b05fa90d64c48bbcf8d543b0744b6786b2f5d42b",
+                    "nonce" : "0xa9d263ec3d119853",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x3c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41",
-                    "stateRoot" : "0x33fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949be",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a0bcd7480b157f292a78423340d5bd5ec42cd45f4e45efc6a56b2a2d8c7e7525e3883331bfb0b3e1de55f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07bf0530bc6898172575bbea3b05fa90d64c48bbcf8d543b0744b6786b2f5d42b88a9d263ec3d119853f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dbec8ac13076d8c0bcb72e6483a45f606fcaeb511f1396c1c15ec49f66a6738",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5b93e9fedf779bd4a11fddc73453e66b0da7dcccb8a6c883998096c8e49ad3b1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059b46",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75264ba",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_0_1000000_d0g0v0_Homestead" : {
+    "modexp_1_0_0_1000000_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/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9958",
-                    "hash" : "0x71f47788bf5e9175b2be603e486583aec4c10b21416f8613bf13093cb868a73c",
-                    "mixHash" : "0x5eaf65af4c9cca1f996c2675af2840ab6237e8d9376ae39b4c0acc0ef35f11e6",
-                    "nonce" : "0x29abd5ba65a9204a",
+                    "hash" : "0xba8360dc93e786dc1917e05ce43d8916ab320ee2cfb639b5a0b0e2f8fcc0feaa",
+                    "mixHash" : "0x30f7b3edcbe9f0068f0f2d29629155d5012a2489ba1f5cbe4fffeb63994a8f72",
+                    "nonce" : "0x5216fc54d4789beb",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x3c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a05eaf65af4c9cca1f996c2675af2840ab6237e8d9376ae39b4c0acc0ef35f11e68829abd5ba65a9204af90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a030f7b3edcbe9f0068f0f2d29629155d5012a2489ba1f5cbe4fffeb63994a8f72885216fc54d4789bebf90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71f47788bf5e9175b2be603e486583aec4c10b21416f8613bf13093cb868a73c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xba8360dc93e786dc1917e05ce43d8916ab320ee2cfb639b5a0b0e2f8fcc0feaa",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_0_1000000_d0g0v0_Metropolis" : {
+    "modexp_1_0_0_1000000_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/stPreCompiledContracts/modexp_1_0_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x372655239cb6b8efd210660ee3f05f147dfe64fe9c39f873823c3dfba2389f3e",
-                    "mixHash" : "0x34822e548793bf00d647d3ab61edf5de4029ada6e62f6c889bacf2e4e396cb26",
-                    "nonce" : "0xae927eb37f5d0f45",
+                    "gasUsed" : "0x0f9958",
+                    "hash" : "0x83a2344db4c2e97451437045a6344206c62a6a674988cf0f75c01aea740a377f",
+                    "mixHash" : "0x851206d57ff6b0b98dc24ef05d51cedc9f61207c02ba96337be3d6f15eb82bf3",
+                    "nonce" : "0x9c5ba41047084490",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x3c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41",
+                    "stateRoot" : "0x33fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949be",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a034822e548793bf00d647d3ab61edf5de4029ada6e62f6c889bacf2e4e396cb2688ae927eb37f5d0f45f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033fed93bc249b566137abe2b140182d2e053576fe016666d35c6179e0f8949bea08b5effc9b4ce2426ae150ad500b2061ba4c27dc831f73f71b76d27b636fcb325a03c67053fe1a3bf3139435b16260756e179e1634701bfacd5fc341be460460b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99588203e880a0851206d57ff6b0b98dc24ef05d51cedc9f61207c02ba96337be3d6f15eb82bf3889c5ba41047084490f90128f901250101830f995894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0166e46c8f5101e748c558ff1ffcf7de42bdf050ce1e6f1b29d4fc1f7dd8068fea030ea331a16e7de1e6e85eaf5ced87ebb348ed860bf3f60599642b4282495e0b5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x372655239cb6b8efd210660ee3f05f147dfe64fe9c39f873823c3dfba2389f3e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x83a2344db4c2e97451437045a6344206c62a6a674988cf0f75c01aea740a377f",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918245059b46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a75264ba",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json
index ea215bb4e..e937f99cf 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_0_155000_d0g0v0_EIP150" : {
+    "modexp_1_0_0_155000_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/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xcffe5d45800f9acb69c653c5bf3578362fe8507b728cc64deb521b4dea126255",
-                    "mixHash" : "0x04f700ae6ef5fb9057ee0e0fe32d8bc289a3ed5f5f029b600e91673293573d3b",
-                    "nonce" : "0x0dd166b5d0a45490",
+                    "hash" : "0xe449bfbff8777e1e1b9bb6d4d76b57b4ddf70abf87a45679b20b27c17469966b",
+                    "mixHash" : "0x71866e9b2338f480bf84268a28e0168da1de5795d2e9f80c82acb650dc3069dd",
+                    "nonce" : "0x10430d43e2cc104c",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a004f700ae6ef5fb9057ee0e0fe32d8bc289a3ed5f5f029b600e91673293573d3b880dd166b5d0a45490f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a071866e9b2338f480bf84268a28e0168da1de5795d2e9f80c82acb650dc3069dd8810430d43e2cc104cf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcffe5d45800f9acb69c653c5bf3578362fe8507b728cc64deb521b4dea126255",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe449bfbff8777e1e1b9bb6d4d76b57b4ddf70abf87a45679b20b27c17469966b",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_0_155000_d0g0v0_EIP158" : {
+    "modexp_1_0_0_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x9d6ac10814fd0dc937e0a60b914021c102e7155d3a8d92780879aee074768beb",
+                    "mixHash" : "0x0769d159a7dd1923b2467bc5d816d891d0b190264b41f1e9b3fedf6732d0cd40",
+                    "nonce" : "0xb5187da1bcdace3b",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a00769d159a7dd1923b2467bc5d816d891d0b190264b41f1e9b3fedf6732d0cd4088b5187da1bcdace3bf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b490",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x59c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040",
+                        "s" : "0x0ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12f",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d6ac10814fd0dc937e0a60b914021c102e7155d3a8d92780879aee074768beb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_0_155000_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/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x0d15afe9bc451eef5f7124a0e6b5560e23aa47e47605f26202012b141df2e633",
-                    "mixHash" : "0x2f29f345d30fb42013051a9e02b17a19c67cdef1e8f4b25241e035fd1e9f4f11",
-                    "nonce" : "0x910fa3cc15a98da2",
+                    "hash" : "0x3ee9c0f1240e02c5947af63f35025da876870c5fb4210bc4504a3552441ac086",
+                    "mixHash" : "0xc309855554ad5b95d189e0176bdd27a9a5d7ea64a84e6dbd3965af9dba3a7fa0",
+                    "nonce" : "0x89a07ffd49c2ff24",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a02f29f345d30fb42013051a9e02b17a19c67cdef1e8f4b25241e035fd1e9f4f1188910fa3cc15a98da2f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c309855554ad5b95d189e0176bdd27a9a5d7ea64a84e6dbd3965af9dba3a7fa08889a07ffd49c2ff24f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d15afe9bc451eef5f7124a0e6b5560e23aa47e47605f26202012b141df2e633",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3ee9c0f1240e02c5947af63f35025da876870c5fb4210bc4504a3552441ac086",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_0_155000_d0g0v0_Frontier" : {
+    "modexp_1_0_0_155000_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/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b490",
-                    "hash" : "0xd0fb0f08019d0fb81b7017ea8ca613f73c9be6daa4e8c2cc258b93507d0baa49",
-                    "mixHash" : "0xc638a97c3b039f882ccf829c9fb50701c36ab5786cdc3b0fa4d5c647f47bbd30",
-                    "nonce" : "0x9c576018b3239731",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x657db493aa15caf6d13ce6028f321a84893e857db4e5e22c69c2b3f865bf7007",
+                    "mixHash" : "0x8bb6f0fe00c2bed0ae5d9c3cd66e0caea14bf3500a8dced1b51c1878ad81f530",
+                    "nonce" : "0xc940cd3add98afd7",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x7cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bf",
-                    "stateRoot" : "0x65bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a0c638a97c3b039f882ccf829c9fb50701c36ab5786cdc3b0fa4d5c647f47bbd30889c576018b3239731f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a08bb6f0fe00c2bed0ae5d9c3cd66e0caea14bf3500a8dced1b51c1878ad81f53088c940cd3add98afd7f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0fb0f08019d0fb81b7017ea8ca613f73c9be6daa4e8c2cc258b93507d0baa49",
-        "network" : "Frontier",
+        "lastblockhash" : "0x657db493aa15caf6d13ce6028f321a84893e857db4e5e22c69c2b3f865bf7007",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b67e",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4982",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_0_155000_d0g0v0_Homestead" : {
+    "modexp_1_0_0_155000_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/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b490",
-                    "hash" : "0x86ca8349b34108164b0f51544502b4b0d5e24b511d7d2cfd738303d877713af6",
-                    "mixHash" : "0x4af5aef1d9fb87a86e692d931b967af3ca5ef56a514199b963b1eb1e92fd41a9",
-                    "nonce" : "0xa3f766ca04cfb7df",
+                    "hash" : "0xcdd35c48aeafc2c03dadbd56225cc470efc0344955fae0a548ccd53636e64f7e",
+                    "mixHash" : "0x93f6022173e1090576a2e96e046ef96a50d9c94c7ac9e1edb4631663c5d34763",
+                    "nonce" : "0x6e8b9931421b437b",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x7cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bf",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a04af5aef1d9fb87a86e692d931b967af3ca5ef56a514199b963b1eb1e92fd41a988a3f766ca04cfb7dff90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a093f6022173e1090576a2e96e046ef96a50d9c94c7ac9e1edb4631663c5d34763886e8b9931421b437bf90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86ca8349b34108164b0f51544502b4b0d5e24b511d7d2cfd738303d877713af6",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcdd35c48aeafc2c03dadbd56225cc470efc0344955fae0a548ccd53636e64f7e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_0_155000_d0g0v0_Metropolis" : {
+    "modexp_1_0_0_155000_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/stPreCompiledContracts/modexp_1_0_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x075edf724387447345d9ac7ba06d6b8053f4b2e1ca5f0cd46cdc730256b9ab4c",
-                    "mixHash" : "0x6274adfe9fe3264c2cd8c178119bd28918c0b4fd03a1f33aa676408a93ea198e",
-                    "nonce" : "0xfb28980136c23738",
+                    "gasUsed" : "0x02b490",
+                    "hash" : "0xc1b59bd393d3b2ef2c92be5fa4aa89ed379b0a5dd94f6944aa4e0408d57b2fe0",
+                    "mixHash" : "0xf90557b262171458adff7b979837b0e8a2709a434e29896690e2e05108661da7",
+                    "nonce" : "0x2096706a8b9bea12",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x7cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bf",
+                    "stateRoot" : "0x65bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x54d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3cca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a06274adfe9fe3264c2cd8c178119bd28918c0b4fd03a1f33aa676408a93ea198e88fb28980136c23738f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
+                "rlp" : "0xf90328f901f9a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a065bfc2cf4e11f339085c04dc6dd786a62a58388f8e238867087f2a4e1aecd431a054d15756595887792d049eba2be4d3f6a8ad51c8787ed7a1b8381422fbdd3ccaa07cb9094b56220976a73a93c57c686fbf1baabceea42a5c1529503270b9a5d2bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b4908203e880a0f90557b262171458adff7b979837b0e8a2709a434e29896690e2e05108661da7882096706a8b9bea12f90128f9012501018302b49094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca059c75796de7713e3d946bf5f0ec6d80af29dd937b306ba871406681b190e3040a00ce27123109bcfe19968795f5845ccda93b5c3296ab3dd70612e3d64acfbe12fc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x075edf724387447345d9ac7ba06d6b8053f4b2e1ca5f0cd46cdc730256b9ab4c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc1b59bd393d3b2ef2c92be5fa4aa89ed379b0a5dd94f6944aa4e0408d57b2fe0",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f8b67e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a75f4982",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json
index 52ea2d4fb..a8e65de06 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_0_20500_d0g0v0_EIP150" : {
+    "modexp_1_0_0_20500_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/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x769f0d3c99973fe1e58c5f41586c71928158f1ffc6d02b9e9113a08b4b5aa0ae",
-                    "mixHash" : "0xe928597d72c079cec7ce50808b5c860967e471e6564c94f7be6a60b587a6e776",
-                    "nonce" : "0xf039de1ad6dfa79a",
+                    "hash" : "0x79f06da9b8b785a1dee0ac11817a596ab72e6a59cf84a3e0126da426e49d4210",
+                    "mixHash" : "0xeb07640c17ca44946fc42b9f55e43dbf2c88a90539328a0b41ce67fa4aa7050c",
+                    "nonce" : "0x0afb8bcd2ef46ad3",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
-                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
+                    "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
+                    "stateRoot" : "0x3b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0e928597d72c079cec7ce50808b5c860967e471e6564c94f7be6a60b587a6e77688f039de1ad6dfa79af90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0eb07640c17ca44946fc42b9f55e43dbf2c88a90539328a0b41ce67fa4aa7050c880afb8bcd2ef46ad3f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x769f0d3c99973fe1e58c5f41586c71928158f1ffc6d02b9e9113a08b4b5aa0ae",
-        "network" : "EIP150",
+        "lastblockhash" : "0x79f06da9b8b785a1dee0ac11817a596ab72e6a59cf84a3e0126da426e49d4210",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a91a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_1_0_0_20500_d0g0v0_EIP158" : {
+    "modexp_1_0_0_20500_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/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0xf584f33fac9b66141bc4b57097957334059138ca0391dde5eb4713eccdf0947f",
-                    "mixHash" : "0x9e3ee1c0f124c91d5ba5a637daf8861293a3b1ffaa9e292a774eaa1403b27baf",
-                    "nonce" : "0x3ab3fedf6bd96d72",
+                    "hash" : "0x2bbd83fa7d3c595e755b5e9774dce7475fb5411c3c0576116b272e1d9bd72f26",
+                    "mixHash" : "0x408efc394091fcabefbf7e2c22c8a8d3b5deefb651e3308c6cd2801ecc6cd659",
+                    "nonce" : "0x09aec1e27f7ed0ae",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
-                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
+                    "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
+                    "stateRoot" : "0x3b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a09e3ee1c0f124c91d5ba5a637daf8861293a3b1ffaa9e292a774eaa1403b27baf883ab3fedf6bd96d72f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0408efc394091fcabefbf7e2c22c8a8d3b5deefb651e3308c6cd2801ecc6cd6598809aec1e27f7ed0aef90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf584f33fac9b66141bc4b57097957334059138ca0391dde5eb4713eccdf0947f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2bbd83fa7d3c595e755b5e9774dce7475fb5411c3c0576116b272e1d9bd72f26",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a91a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_1_0_0_20500_d0g0v0_Frontier" : {
+    "modexp_1_0_0_20500_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/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0xfc8ea3e839068089e76de4904b03dc8cd5df241a43c792cecf5c9e0420914c79",
-                    "mixHash" : "0x74586cafcd91ad6211ed8ca45cd77da676815b5f5e55480bb602bc974a6dc2ff",
-                    "nonce" : "0xa4ef5e5026309462",
+                    "hash" : "0x121077d3f0c048c5d37c22e7a11abe57db5d608390a32289771965bf8537ad74",
+                    "mixHash" : "0x7a91065cbba2fc723b947e723cfb5b6cf939826ff17aca3161812ca998951083",
+                    "nonce" : "0xe83b6a5fad516f82",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a074586cafcd91ad6211ed8ca45cd77da676815b5f5e55480bb602bc974a6dc2ff88a4ef5e5026309462f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a07a91065cbba2fc723b947e723cfb5b6cf939826ff17aca3161812ca99895108388e83b6a5fad516f82f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc8ea3e839068089e76de4904b03dc8cd5df241a43c792cecf5c9e0420914c79",
-        "network" : "Frontier",
+        "lastblockhash" : "0x121077d3f0c048c5d37c22e7a11abe57db5d608390a32289771965bf8537ad74",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_1_0_0_20500_d0g0v0_Homestead" : {
+    "modexp_1_0_0_20500_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/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0xf06605ca3fb8a1d3b6a85bc1d58eecfb9e1afc49f4bed20900d33494725fe1f9",
-                    "mixHash" : "0x727136b857c3d595c6aa6dbb1c432936d6cefc073d82f6c86ef0e8b162f96518",
-                    "nonce" : "0x4248f8ad63ce009e",
+                    "hash" : "0x88b5b68b4a572865fa3e9f6c3a50306313bdffd96de93c6a93b722799c187713",
+                    "mixHash" : "0xf24ea98b95d6c19325b3d800248c42c5426d6f86693129e8aaa2f63874a4a324",
+                    "nonce" : "0x760bfd68cd0f5522",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0727136b857c3d595c6aa6dbb1c432936d6cefc073d82f6c86ef0e8b162f96518884248f8ad63ce009ef90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0f24ea98b95d6c19325b3d800248c42c5426d6f86693129e8aaa2f63874a4a32488760bfd68cd0f5522f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf06605ca3fb8a1d3b6a85bc1d58eecfb9e1afc49f4bed20900d33494725fe1f9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x88b5b68b4a572865fa3e9f6c3a50306313bdffd96de93c6a93b722799c187713",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_1_0_0_20500_d0g0v0_Metropolis" : {
+    "modexp_1_0_0_20500_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/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa72c",
-                    "hash" : "0x800d4eb39c3348a40c40d7e0ecfb59bf3033b7b17078a23794ab9c552b7fa462",
-                    "mixHash" : "0x890ec7c87b3bfac1d45f8f1f05d090e0739625255d6d392ab43b2211517c646a",
-                    "nonce" : "0x73e4187cf64dacb5",
+                    "hash" : "0xc861f51dc4d1accbae0c1e1ca5b63e5f064d1e726f751f03c1e2cfa40f6ca31f",
+                    "mixHash" : "0x25e705a8b8fe3660379f95e21259d8adb8e91b98b5b76378b147edacff58da94",
+                    "nonce" : "0xa4e1568c20fb809d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x55f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420",
-                    "stateRoot" : "0x3b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7",
+                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
+                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03b8c0330b97464caacb8d882626e5744537420b3a9aa9a0ba8952cf3baa75ad7a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa055f79ba03035bb146847b2dac7ecb0f4d5710c2c06e250ac1556b51cbb384420b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0890ec7c87b3bfac1d45f8f1f05d090e0739625255d6d392ab43b2211517c646a8873e4187cf64dacb5f90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a025e705a8b8fe3660379f95e21259d8adb8e91b98b5b76378b147edacff58da9488a4e1568c20fb809df90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x800d4eb39c3348a40c40d7e0ecfb59bf3033b7b17078a23794ab9c552b7fa462",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc861f51dc4d1accbae0c1e1ca5b63e5f064d1e726f751f03c1e2cfa40f6ca31f",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6a91a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76156e6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_0_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_0_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa72c",
+                    "hash" : "0xfb24a064710a37c96481e79385d2c8ee87787f8a93e94951707acfb982827943",
+                    "mixHash" : "0xa2adf62bc96e49aef4f7f656bbd51d2dfa5c7aab2dd6dfc04fab2c0e62158c37",
+                    "nonce" : "0x0cfae93ced584eda",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0xe62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2",
+                    "stateRoot" : "0x94433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a094433d9887fddcb01d9414b66b1ae054ad26a2afaa2f9358df529218a0048964a0f31bfd60a4b4cc6b25fb80a31b677576fd860fbb0d9bb8ff664d4fcb757c9faaa0e62fa26a1cd575cf073b60a53b41789ee8292062cffc451cf1ced9b1445703b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a72c8203e880a0a2adf62bc96e49aef4f7f656bbd51d2dfa5c7aab2dd6dfc04fab2c0e62158c37880cfae93ced584edaf90127f90124010182a72c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca098ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134a02d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa72c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x98ce85d9b9d12415ab6d4406f99143fcc27a98b6cf23602db322217e1ef3e134",
+                        "s" : "0x2d6189856f3993547ea119f65a947d6fe4cfa684464b4efbac17b941e865d970",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfb24a064710a37c96481e79385d2c8ee87787f8a93e94951707acfb982827943",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json
index 298895dff..65c0e7a24 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_0_22000_d0g0v0_EIP150" : {
+    "modexp_1_0_0_22000_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/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x01959893de9cb6b6a5bd4ad84ff59f799d66c10a01e2a5db507bf61277befc10",
-                    "mixHash" : "0xf816e81da85b017839cd445ce7657bd7241d7d68221259289ccaf3aa9e0a1697",
-                    "nonce" : "0xacd602fadea37bae",
+                    "hash" : "0xa3eeecc1edecf751daf1a03477167ab5682cf38ccd2cec50bc21400f71a2d428",
+                    "mixHash" : "0xd3fe7624cb7cec0486f84bfd59bd3e4554329473d3eb29939b6984ac5172d612",
+                    "nonce" : "0xcb82a4c2db439485",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0f816e81da85b017839cd445ce7657bd7241d7d68221259289ccaf3aa9e0a169788acd602fadea37baef90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0d3fe7624cb7cec0486f84bfd59bd3e4554329473d3eb29939b6984ac5172d61288cb82a4c2db439485f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01959893de9cb6b6a5bd4ad84ff59f799d66c10a01e2a5db507bf61277befc10",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa3eeecc1edecf751daf1a03477167ab5682cf38ccd2cec50bc21400f71a2d428",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_0_22000_d0g0v0_EIP158" : {
+    "modexp_1_0_0_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x553f5fe18fac0b988452e41b55922a8a5261ab3c3a043e7eee3d4bb12bd1d9e4",
+                    "mixHash" : "0xe9b7d2f3b80b3ab7653608696280a7d5771b668d2d3023025a712213b22add51",
+                    "nonce" : "0xf076ab1e0d8db7cd",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0e9b7d2f3b80b3ab7653608696280a7d5771b668d2d3023025a712213b22add5188f076ab1e0d8db7cdf90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xad08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954",
+                        "s" : "0x19be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x553f5fe18fac0b988452e41b55922a8a5261ab3c3a043e7eee3d4bb12bd1d9e4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_0_22000_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/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xae024f4316bfa387e39d17cc669839e089abd891495fd61c62a7c2200bbf53e7",
-                    "mixHash" : "0x749a3e4f681b28cd459650dd6a6cbff32926486110ea8c35c0435b679d276df7",
-                    "nonce" : "0x33e0f5825ab1de08",
+                    "hash" : "0x4635ac58284813cde0778624abef6251c41397c388adfe685978ebd84ff3c41a",
+                    "mixHash" : "0xd09a9c7e6d52d89f9854581e21817334b88475f3f0616dc4b46c84b36e19c6c4",
+                    "nonce" : "0x2af1f9c152332282",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0749a3e4f681b28cd459650dd6a6cbff32926486110ea8c35c0435b679d276df78833e0f5825ab1de08f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0d09a9c7e6d52d89f9854581e21817334b88475f3f0616dc4b46c84b36e19c6c4882af1f9c152332282f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae024f4316bfa387e39d17cc669839e089abd891495fd61c62a7c2200bbf53e7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4635ac58284813cde0778624abef6251c41397c388adfe685978ebd84ff3c41a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_0_22000_d0g0v0_Frontier" : {
+    "modexp_1_0_0_22000_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/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad08",
-                    "hash" : "0x95c075272e3566c4b188f455e07584c058f7af2200b4ed7fe953a2435c7a95d3",
-                    "mixHash" : "0xa521497b17630b1ea72d133a5e9595e4c9346ef075ef37aeca1e6f43fe91e94c",
-                    "nonce" : "0x6bb3634bf8c91f63",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x555d999ffb5b507ec463e6e4f95367edcd6855baf892cdda4af4e35f67dc7795",
+                    "mixHash" : "0xc1335a5047460ab19d76f136326ff6bd8c83396d9011acfc902eb19ff7eecf50",
+                    "nonce" : "0x95ff7fa8961698fa",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231",
-                    "stateRoot" : "0xd1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a0a521497b17630b1ea72d133a5e9595e4c9346ef075ef37aeca1e6f43fe91e94c886bb3634bf8c91f63f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0c1335a5047460ab19d76f136326ff6bd8c83396d9011acfc902eb19ff7eecf508895ff7fa8961698faf90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95c075272e3566c4b188f455e07584c058f7af2200b4ed7fe953a2435c7a95d3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x555d999ffb5b507ec463e6e4f95367edcd6855baf892cdda4af4e35f67dc7795",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aef6",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761510a",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_0_22000_d0g0v0_Homestead" : {
+    "modexp_1_0_0_22000_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/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad08",
-                    "hash" : "0x40c6d0a79d1d789de90129297f46d70abf4cac1f40a2fc055eaa7770d5c4d1e7",
-                    "mixHash" : "0x5985f018971f002606d019bc35d36b7a648deb417e3efe8460742f430fd3a380",
-                    "nonce" : "0xc65faf68b0938732",
+                    "hash" : "0x61e9e5b4477367dc33291820ca840e5b78e59a4ffb8512be5246da3e8805b777",
+                    "mixHash" : "0x4213fe3323d5c44538cd0abfc047064499f335ce63a51c8c6ba64d07e08669ed",
+                    "nonce" : "0xe4e58c29b4cfd078",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a05985f018971f002606d019bc35d36b7a648deb417e3efe8460742f430fd3a38088c65faf68b0938732f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a04213fe3323d5c44538cd0abfc047064499f335ce63a51c8c6ba64d07e08669ed88e4e58c29b4cfd078f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40c6d0a79d1d789de90129297f46d70abf4cac1f40a2fc055eaa7770d5c4d1e7",
-        "network" : "Homestead",
+        "lastblockhash" : "0x61e9e5b4477367dc33291820ca840e5b78e59a4ffb8512be5246da3e8805b777",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_0_22000_d0g0v0_Metropolis" : {
+    "modexp_1_0_0_22000_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/stPreCompiledContracts/modexp_1_0_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x29d0d24678633c2065cf1c4a6f6e2ed60f9733dfecf36e131b29b7a34831153a",
-                    "mixHash" : "0x94105a3d5ac7b791bd32c4fc1ac67cabb763df392ee183c4afb3e7e6ea5c5b30",
-                    "nonce" : "0xd6e8858c49423bb0",
+                    "gasUsed" : "0xad08",
+                    "hash" : "0x8c3ab040688721cdef4674e3bf5533e4ae39869205dfad4f295a194b98fc64a4",
+                    "mixHash" : "0x1d64e30a255d1a706f0a56bc78f01681435a23295fd8f438f8d6ccabde6edf62",
+                    "nonce" : "0x3e1bb5865b07ed29",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231",
+                    "stateRoot" : "0xd1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a094105a3d5ac7b791bd32c4fc1ac67cabb763df392ee183c4afb3e7e6ea5c5b3088d6e8858c49423bb0f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d1f5bc2dee482fceee5c9a1613d5532eb4deb41f02c40d098d6db01a1553cfd1a00a01392a7271181c63ad73ef3d7c640d5a0c2f8f9c0bf51820af350db90af3d6a0070c93703e539ee45dbc0b777e505506190ca067101777eba2c62c0adb2f0231b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad088203e880a01d64e30a255d1a706f0a56bc78f01681435a23295fd8f438f8d6ccabde6edf62883e1bb5865b07ed29f90127f90124010182ad0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba04ffe15f8749c5f136464b9044f407b88189595d14d79bd7a468d293ddd516954a019be242971ce041218ba3167f0c1590f2e5aaafe30f179cdb757916cd0facb28c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29d0d24678633c2065cf1c4a6f6e2ed60f9733dfecf36e131b29b7a34831153a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8c3ab040688721cdef4674e3bf5533e4ae39869205dfad4f295a194b98fc64a4",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f6aef6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a761510a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json
index 2b6c9f5fc..2d5092d51 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_0_25000_d0g0v0_EIP150" : {
+    "modexp_1_0_0_25000_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/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x1512fc8b1d108f249c4facc669e01104e5f5634e3d8675cce6e7df5e273573cc",
-                    "mixHash" : "0x00f7ccdecb21acd2e9e36373a26c58b14db57c3bcfeefa99bde5aa9d673afe86",
-                    "nonce" : "0xd6a676bcb7f426d9",
+                    "hash" : "0x081dde1a33460814ab5092da51a1920cc27431c7203bff728fc54155aa3a8696",
+                    "mixHash" : "0x315736bdf0d58e3fefeb2709d120a778205f673b90dc9b65fea46ee9f0b58181",
+                    "nonce" : "0xe45d6c8eb5459c20",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a000f7ccdecb21acd2e9e36373a26c58b14db57c3bcfeefa99bde5aa9d673afe8688d6a676bcb7f426d9f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0315736bdf0d58e3fefeb2709d120a778205f673b90dc9b65fea46ee9f0b5818188e45d6c8eb5459c20f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1512fc8b1d108f249c4facc669e01104e5f5634e3d8675cce6e7df5e273573cc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x081dde1a33460814ab5092da51a1920cc27431c7203bff728fc54155aa3a8696",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_0_25000_d0g0v0_EIP158" : {
+    "modexp_1_0_0_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0xb7009455e408393bf9bcc6c1ed229b60a6c9adfd6f7726711faf8a32a6140fce",
+                    "mixHash" : "0x4c0f4572a1196f7330d7e16b1d0cd083cb755eb17057559ba7d43596a7b37471",
+                    "nonce" : "0xce7e1c6c95e30463",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04c0f4572a1196f7330d7e16b1d0cd083cb755eb17057559ba7d43596a7b3747188ce7e1c6c95e30463f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb8c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279",
+                        "s" : "0x52bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb7009455e408393bf9bcc6c1ed229b60a6c9adfd6f7726711faf8a32a6140fce",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_0_25000_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/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0xa1e8b44f80178363adec5d13865ac73f9f814b01a9dc0ecc282df1468833640d",
-                    "mixHash" : "0x9ca8a8f33cbfc54173d5380d0fa69fdb82df790f4bdd24051935cd87c2560236",
-                    "nonce" : "0x1df27f094db75b56",
+                    "hash" : "0x6a0120f6ca932266017f0a107cbcbb49bd76de852a477f7fcba4d8d23bdd4d21",
+                    "mixHash" : "0x4918c8fe1139a7a0057d258ede1eb4821620054513df7453e90366ae49057893",
+                    "nonce" : "0xb276098291da71f0",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a09ca8a8f33cbfc54173d5380d0fa69fdb82df790f4bdd24051935cd87c2560236881df27f094db75b56f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a04918c8fe1139a7a0057d258ede1eb4821620054513df7453e90366ae4905789388b276098291da71f0f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1e8b44f80178363adec5d13865ac73f9f814b01a9dc0ecc282df1468833640d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6a0120f6ca932266017f0a107cbcbb49bd76de852a477f7fcba4d8d23bdd4d21",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_0_25000_d0g0v0_Frontier" : {
+    "modexp_1_0_0_25000_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/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb8c0",
-                    "hash" : "0xd49a840bb746f643d20f9c7131a62bbdb6ce5782d5a74f7b41247cdaf491689d",
-                    "mixHash" : "0x8e383a21673a4c1b270fd8e872116f4a91a9795a38b12b08d3419e8ba7dbff8d",
-                    "nonce" : "0xbd3f9aee54e4e0da",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x10a9eb56ee4c105e5668c9bbd5ac8cd4af5c292a538aa217dc4d257744b8d82f",
+                    "mixHash" : "0x527dcc66cc3eb6bd4db8198d7a0bef4af24ea282ece2a627acd40b067c91fe4d",
+                    "nonce" : "0xb442f8eff76296e7",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x96add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18af",
-                    "stateRoot" : "0x327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a08e383a21673a4c1b270fd8e872116f4a91a9795a38b12b08d3419e8ba7dbff8d88bd3f9aee54e4e0daf90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0527dcc66cc3eb6bd4db8198d7a0bef4af24ea282ece2a627acd40b067c91fe4d88b442f8eff76296e7f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd49a840bb746f643d20f9c7131a62bbdb6ce5782d5a74f7b41247cdaf491689d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x10a9eb56ee4c105e5668c9bbd5ac8cd4af5c292a538aa217dc4d257744b8d82f",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6baae",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614552",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_0_25000_d0g0v0_Homestead" : {
+    "modexp_1_0_0_25000_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/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb8c0",
-                    "hash" : "0x26daec024416b6acd4135a06a6e36260c4c081465b56bed91899e3c88e739e0f",
-                    "mixHash" : "0x3c76cd5695f97143b5647096045ea3fc960ff604f177901246deb48ed1636f18",
-                    "nonce" : "0x2bb32fa53afaff6e",
+                    "hash" : "0xa6f779a1ec053526503cb501e82d787dfbd344a11fe14b561c936be3a59554af",
+                    "mixHash" : "0x539289f4b2abaed4b2f4c6828404d8261b8dceb253710ed4398aefb6ba6a3249",
+                    "nonce" : "0x040bcb105fa05bd6",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x96add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18af",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a03c76cd5695f97143b5647096045ea3fc960ff604f177901246deb48ed1636f18882bb32fa53afaff6ef90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a0539289f4b2abaed4b2f4c6828404d8261b8dceb253710ed4398aefb6ba6a324988040bcb105fa05bd6f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26daec024416b6acd4135a06a6e36260c4c081465b56bed91899e3c88e739e0f",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa6f779a1ec053526503cb501e82d787dfbd344a11fe14b561c936be3a59554af",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_0_25000_d0g0v0_Metropolis" : {
+    "modexp_1_0_0_25000_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/stPreCompiledContracts/modexp_1_0_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0x90ae0acf64a0f66680590a2383aaf521a0658349382e095437862ac296d7ce3a",
-                    "mixHash" : "0x5796d775cee498d7b178e56b2c84ad2ec88c2562fde511450e75cf4f1694de18",
-                    "nonce" : "0x4342e2c64d7a9878",
+                    "gasUsed" : "0xb8c0",
+                    "hash" : "0x48a510f97822919b336263c03c6f88bb8b7ffa3b14005f562bf9943d14787ecf",
+                    "mixHash" : "0xa630d68df98b96e0a8d2414e5ca71e63d94b98851ce3fb25de203aaca76b57c4",
+                    "nonce" : "0x70c9aabba7572c69",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x96add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18af",
+                    "stateRoot" : "0x327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a05796d775cee498d7b178e56b2c84ad2ec88c2562fde511450e75cf4f1694de18884342e2c64d7a9878f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0327c28a058caafd4688b8f10c8ff33249da1ad084d8c7dc30f403cbf77f74535a00fcc3be658a4fa9a41078bacc7299cff4e4fa0230ead4fafa2ecb87adb15357ba096add5a32f3041bc79d229ddb2b57e7099c9604b7279507cb0e2ae5610af18afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b8c08203e880a0a630d68df98b96e0a8d2414e5ca71e63d94b98851ce3fb25de203aaca76b57c48870c9aabba7572c69f90127f90124010182b8c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ba0ee94bd90a4be3287cd6a25245af20404e4e3a303763cc14805ec373f6bca1279a052bdb9918c341a0a2c4ac35b0733a87af151f6b86cec54f6a7b0121df310caf0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90ae0acf64a0f66680590a2383aaf521a0658349382e095437862ac296d7ce3a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x48a510f97822919b336263c03c6f88bb8b7ffa3b14005f562bf9943d14787ecf",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f6baae",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a7614552",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json
index 4eaf0956d..3224b48ed 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_0_35000_d0g0v0_EIP150" : {
+    "modexp_1_0_0_35000_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/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x554c79b490b1689c6cbed2a2f0d696616af9d4c98363d7683a4ca256a49e694c",
-                    "mixHash" : "0x724737faead74c9be5dca6a4b0353ae6c1e5211ef2abe8a8993c9ce64eaa8b40",
-                    "nonce" : "0xaa2cc230c8ce3d56",
+                    "hash" : "0xd6b804714a90dcfd6578bf69d36464c2fc6ef59243403f4d42fd45a813eb2007",
+                    "mixHash" : "0x3f2c253db18d6d9b5f1493c6e89f966c3f2e316539c6073f72d77542933b5b1a",
+                    "nonce" : "0xbeba377c85933f2d",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
-                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0724737faead74c9be5dca6a4b0353ae6c1e5211ef2abe8a8993c9ce64eaa8b4088aa2cc230c8ce3d56f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a03f2c253db18d6d9b5f1493c6e89f966c3f2e316539c6073f72d77542933b5b1a88beba377c85933f2df90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x554c79b490b1689c6cbed2a2f0d696616af9d4c98363d7683a4ca256a49e694c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd6b804714a90dcfd6578bf69d36464c2fc6ef59243403f4d42fd45a813eb2007",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ae7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_0_35000_d0g0v0_EIP158" : {
+    "modexp_1_0_0_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x1887336775447a0fce8d4a13b951355ba2a848cf1534c5fc7249794f175bb184",
+                    "mixHash" : "0x49121b33ae87ced49d499b4a94614474e9a255ed1932d112d2ebece52ecd1f55",
+                    "nonce" : "0x2901841e44edb70d",
+                    "number" : "0x01",
+                    "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
+                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a049121b33ae87ced49d499b4a94614474e9a255ed1932d112d2ebece52ecd1f55882901841e44edb70df90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xdfd0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34",
+                        "s" : "0x1bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1887336775447a0fce8d4a13b951355ba2a848cf1534c5fc7249794f175bb184",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ae7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615181",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_0_35000_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/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xac91",
-                    "hash" : "0x76729bd65d10a4d90e775ea5df8e84a7c23a7f7fc425d92179a3406290b7c946",
-                    "mixHash" : "0xad531af8f53527b31987a9714ad23b79734de8797ea79e37b21624f762ee1c72",
-                    "nonce" : "0xfd5a47709ab1d8a8",
+                    "hash" : "0xd3e8f4ce3a9de2cad82688628ca7088f93b1cbfa5d6024bf351df82ac6bf0922",
+                    "mixHash" : "0x7dac15974fbd7f5b8452f743c9ad15a933af31dc2552d5231a073dbba6f4fb92",
+                    "nonce" : "0x1d76284b064c45d9",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0ad531af8f53527b31987a9714ad23b79734de8797ea79e37b21624f762ee1c7288fd5a47709ab1d8a8f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a07dac15974fbd7f5b8452f743c9ad15a933af31dc2552d5231a073dbba6f4fb92881d76284b064c45d9f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76729bd65d10a4d90e775ea5df8e84a7c23a7f7fc425d92179a3406290b7c946",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd3e8f4ce3a9de2cad82688628ca7088f93b1cbfa5d6024bf351df82ac6bf0922",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_0_35000_d0g0v0_Frontier" : {
+    "modexp_1_0_0_35000_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/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xdfd0",
-                    "hash" : "0xf5db4aea176d23371e6dc7138881375121b6eba74d5b0b9f3c29ea056ef8ca3c",
-                    "mixHash" : "0x3e7d2f9e71e612b14453ae8a02894e28432445b23f7d1e948bede48f0e0b335b",
-                    "nonce" : "0xb223ff50cb86cedc",
+                    "gasUsed" : "0xac91",
+                    "hash" : "0x39514d588fd9e0624871b823062413e65712a8483e0da7eeb7620ac806172147",
+                    "mixHash" : "0xa64b9186f4163a178fde0e6cea80ae816e01abe38446f57a2feebca3425c2d7e",
+                    "nonce" : "0xe8c45d37052461c0",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x24129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17",
-                    "stateRoot" : "0x5c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12",
+                    "receiptTrie" : "0xc8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86",
+                    "stateRoot" : "0x0bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a03e7d2f9e71e612b14453ae8a02894e28432445b23f7d1e948bede48f0e0b335b88b223ff50cb86cedcf90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00bb8579da21521c4a39bd3bf47d7a024cd2ffda485a20fa19f10b42d3a489703a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a0c8883a7476d776ecd31ea160da35421dba55a00e8651e8d7b37cb7fde3260e86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0a64b9186f4163a178fde0e6cea80ae816e01abe38446f57a2feebca3425c2d7e88e8c45d37052461c0f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5db4aea176d23371e6dc7138881375121b6eba74d5b0b9f3c29ea056ef8ca3c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x39514d588fd9e0624871b823062413e65712a8483e0da7eeb7620ac806172147",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e1be",
+                "balance" : "0x4563918244f6ae7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611e42",
+                "balance" : "0x0de0b6b3a7615181",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_0_35000_d0g0v0_Homestead" : {
+    "modexp_1_0_0_35000_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/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xdfd0",
-                    "hash" : "0xd42fe52a2a59c8445a6c8f545460e6ec35d432d0a44609a7721b2b1ad4f0eb8d",
-                    "mixHash" : "0x795e1ef0f58f8b8ddcc6d095e7ddac923dec56c1cf25f90b46bc9974fbe79aab",
-                    "nonce" : "0xf375bfc940c18439",
+                    "hash" : "0x144e20ddac0403691bd5f1d4268a5629e5ec17f93697939496034d6339c66977",
+                    "mixHash" : "0x1d726bc489742409b0c59f848dfc793da965bf5f90a61fe7bc82fdde47860df1",
+                    "nonce" : "0x2c1a7d564abc391b",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
                     "receiptTrie" : "0x24129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a0795e1ef0f58f8b8ddcc6d095e7ddac923dec56c1cf25f90b46bc9974fbe79aab88f375bfc940c18439f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a01d726bc489742409b0c59f848dfc793da965bf5f90a61fe7bc82fdde47860df1882c1a7d564abc391bf90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd42fe52a2a59c8445a6c8f545460e6ec35d432d0a44609a7721b2b1ad4f0eb8d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x144e20ddac0403691bd5f1d4268a5629e5ec17f93697939496034d6339c66977",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_0_35000_d0g0v0_Metropolis" : {
+    "modexp_1_0_0_35000_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/stPreCompiledContracts/modexp_1_0_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xac91",
-                    "hash" : "0xdb5ca10a47fb1dfcc4f1bb8fbb6e7b59db5647896bf52e4c5cfd18f6911f3f7a",
-                    "mixHash" : "0x847fc33791456a4d60d98e6e998bd3126cbee4f300dd3a390a6bcc6f3b2ca706",
-                    "nonce" : "0xa055f461855a056a",
+                    "gasUsed" : "0xdfd0",
+                    "hash" : "0x7dc537ae6062c71071ad12c73a9125a09dc95666a6121c8f694056bf12d6bb79",
+                    "mixHash" : "0x3495faff6b43ff4e458c138d0d382b9273bdba7d764e80a32eea390aada3f79d",
+                    "nonce" : "0x81dbebd3c4d618c9",
                     "number" : "0x01",
                     "parentHash" : "0xd78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21",
-                    "receiptTrie" : "0x9fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07",
-                    "stateRoot" : "0x8e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02ed",
+                    "receiptTrie" : "0x24129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17",
+                    "stateRoot" : "0x5c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08e1dd55f8b8d73c671f6be8559a395a574b9d853899b64be6f09f794f82c02eda00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a09fff7ea20b711f187fa99203bb06796a429245b8f48543971242d0a51a9b9c07b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ac918203e880a0847fc33791456a4d60d98e6e998bd3126cbee4f300dd3a390a6bcc6f3b2ca70688a055f461855a056af90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
+                "rlp" : "0xf90326f901f8a0d78a2526009bf551495954d7189a98b948628dca455f3446136a450914a4bc21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05c367c9d0eae700c78d86a3b32cf5321a0b161ab9a0dd0673aba69c6a72d4d12a00e9fe8393a66c22bf324de50df18f8d633aa1fdd41a03e40588cb04aeb720b61a024129c4a8717c29fe25c962ab3a652009ad9d1e0f7ece928cb6e6a4da327fa17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082dfd08203e880a03495faff6b43ff4e458c138d0d382b9273bdba7d764e80a32eea390aada3f79d8881dbebd3c4d618c9f90127f90124010182dfd094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001ca0bf75101d839288e294a81a45836a577ee5864550a7ade7db54cee24451351b34a01bcd116c7806003ea52382d69ef16288b40b890f28254f0b7493b4d784eb7bf9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b320df621b8738917032719f4ba9c4855edd2fe795efba803ba5242ce7564bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb5ca10a47fb1dfcc4f1bb8fbb6e7b59db5647896bf52e4c5cfd18f6911f3f7a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7dc537ae6062c71071ad12c73a9125a09dc95666a6121c8f694056bf12d6bb79",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ae7f",
+                "balance" : "0x4563918244f6e1be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615181",
+                "balance" : "0x0de0b6b3a7611e42",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json
index 14b947bdd..a35750a0f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_1_1000000_d0g0v0_EIP150" : {
+    "modexp_1_0_1_1000000_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/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xd6a0c63498562f23b8f294d18bc1bae8a509c94d911ba718aafa4a838b64df04",
-                    "mixHash" : "0xca3bd0739af81aba3f405665fe0db5f38ee1456de45cd85d92de4ae460752bb1",
-                    "nonce" : "0xeac5c4459825d996",
+                    "hash" : "0x87c07889f0db83b2ff76f0ba63fb4782a94b395d10cba9529352cec3ceca3d26",
+                    "mixHash" : "0x687273b05c999ecc7750ca99c2a735af7816373339a800ca2ae3e1167fc691ad",
+                    "nonce" : "0x656f666d3b8cc2ba",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ca3bd0739af81aba3f405665fe0db5f38ee1456de45cd85d92de4ae460752bb188eac5c4459825d996f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0687273b05c999ecc7750ca99c2a735af7816373339a800ca2ae3e1167fc691ad88656f666d3b8cc2baf90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6a0c63498562f23b8f294d18bc1bae8a509c94d911ba718aafa4a838b64df04",
-        "network" : "EIP150",
+        "lastblockhash" : "0x87c07889f0db83b2ff76f0ba63fb4782a94b395d10cba9529352cec3ceca3d26",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_1_1000000_d0g0v0_EIP158" : {
+    "modexp_1_0_1_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xb80b8a84239ec9fa2bfa8073cd75587a1ace499cc53f061590c19d476a8cf22b",
+                    "mixHash" : "0xfccfc1bb69b8a343796616fd0126a9398c91e9fbced165e08433e93b5e5fe394",
+                    "nonce" : "0x5bb537faecc4291b",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0fccfc1bb69b8a343796616fd0126a9398c91e9fbced165e08433e93b5e5fe394885bb537faecc4291bf90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f99d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4",
+                        "s" : "0x20f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb80b8a84239ec9fa2bfa8073cd75587a1ace499cc53f061590c19d476a8cf22b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_1_1000000_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/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xb49507e32f216ad2af354ff78b0d6e23cf206b034d4f49518a917e63f90af50e",
-                    "mixHash" : "0x2af6735abaee12ffd0254059661386b7f46ea6dceca446c20ae3303d3edfaeca",
-                    "nonce" : "0xb294c6a4b95eda1b",
+                    "hash" : "0x8734b9aca778c6afe4927bc28ee6d60021051a2c852007e885df8d1c196997a7",
+                    "mixHash" : "0xed8c0b75b996a83bdbc9498f05dfc96ff40f08c6b1ccc94b6f9a4b2e2518587a",
+                    "nonce" : "0x35007c5e808809b7",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a02af6735abaee12ffd0254059661386b7f46ea6dceca446c20ae3303d3edfaeca88b294c6a4b95eda1bf90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ed8c0b75b996a83bdbc9498f05dfc96ff40f08c6b1ccc94b6f9a4b2e2518587a8835007c5e808809b7f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb49507e32f216ad2af354ff78b0d6e23cf206b034d4f49518a917e63f90af50e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8734b9aca778c6afe4927bc28ee6d60021051a2c852007e885df8d1c196997a7",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_1_1000000_d0g0v0_Frontier" : {
+    "modexp_1_0_1_1000000_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/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f99d8",
-                    "hash" : "0x9f9608c1dbd98c75a482b55475ee970d1227499bdb3b0b73c029fac46cc68652",
-                    "mixHash" : "0x97136f8e351fe9e6f45db651446f1ee0a6d55171d91fd873100954d89c850f2f",
-                    "nonce" : "0x6936f3a3991df39d",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xc8a698cde67a36da3dede37d65e8446e16e849ac1b6da6d2db35e20a074c393d",
+                    "mixHash" : "0x4d208072f78dc718e48318ef49dc12158b6a01cb616688c7c09f4484268c90a4",
+                    "nonce" : "0x598bbd48232aab7a",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x3e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97e",
-                    "stateRoot" : "0x628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a097136f8e351fe9e6f45db651446f1ee0a6d55171d91fd873100954d89c850f2f886936f3a3991df39df90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a04d208072f78dc718e48318ef49dc12158b6a01cb616688c7c09f4484268c90a488598bbd48232aab7af90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f9608c1dbd98c75a482b55475ee970d1227499bdb3b0b73c029fac46cc68652",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc8a698cde67a36da3dede37d65e8446e16e849ac1b6da6d2db35e20a074c393d",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059bc6",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a752643a",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_1_1000000_d0g0v0_Homestead" : {
+    "modexp_1_0_1_1000000_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/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f99d8",
-                    "hash" : "0x3f5e718fb752561327380b8317c1af7d118075840de14f1edaf4a15ed3f7e5e1",
-                    "mixHash" : "0x2f1af1d6985c3023a0e75da2f4fdac5defbee9ba323f7cff69774e556023107a",
-                    "nonce" : "0x55ec5c2ac9fcc8ef",
+                    "hash" : "0x25bd09aae11f63d137f5eb3fcf1414f096281a402d9ce489e22bc18306a8f208",
+                    "mixHash" : "0x42b1472e23707f27c508d0570d05f09d34612e9b5e6592f999b2c4bc38999324",
+                    "nonce" : "0x6ba6bfab5e4f901e",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x3e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97e",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a02f1af1d6985c3023a0e75da2f4fdac5defbee9ba323f7cff69774e556023107a8855ec5c2ac9fcc8eff90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a042b1472e23707f27c508d0570d05f09d34612e9b5e6592f999b2c4bc38999324886ba6bfab5e4f901ef90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f5e718fb752561327380b8317c1af7d118075840de14f1edaf4a15ed3f7e5e1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x25bd09aae11f63d137f5eb3fcf1414f096281a402d9ce489e22bc18306a8f208",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_1_1000000_d0g0v0_Metropolis" : {
+    "modexp_1_0_1_1000000_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/stPreCompiledContracts/modexp_1_0_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0x4383116c888452907cba3fd75e676b615daab8b22b132ca5bfcc33fd59ead34a",
-                    "mixHash" : "0x6df6e96e840d7fe229e37658febcd62fd748752e6c423da37cfec94808bf029a",
-                    "nonce" : "0xabe95fa9b9b89be7",
+                    "gasUsed" : "0x0f99d8",
+                    "hash" : "0x31a085aab803abc251776a33217270bd2929d672db6fd3a1e1f821b857e6c976",
+                    "mixHash" : "0x42c08448a20cbd39ed8429815b361e7bb4ed864bfcf0b10772ffc7d6545bca19",
+                    "nonce" : "0xe168039c10ee012c",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x3e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97e",
+                    "stateRoot" : "0x628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a06df6e96e840d7fe229e37658febcd62fd748752e6c423da37cfec94808bf029a88abe95fa9b9b89be7f90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0628a925423d872307b05ec7eef528b8ac4efdbb4227313dcdb8f8e0088a7edb2a0b4fc782d6d7a35e45adb3840fe1964e5d3d1b18ad1ad9d97f3502a392162b622a03e6abe3c07c5a439b4fa8e4f6b63a1365a40db00edc78723554c30f62335e97eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f99d88203e880a042c08448a20cbd39ed8429815b361e7bb4ed864bfcf0b10772ffc7d6545bca1988e168039c10ee012cf90128f901250101830f99d894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca02e20c95b990aa91568bfa6a9413868cdc5085799a3c4d8d7b4bffea740da22f4a020f41d3804ee9fdf05647a6beb95c24860c5926c803bf5d05628b192a43e459dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4383116c888452907cba3fd75e676b615daab8b22b132ca5bfcc33fd59ead34a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x31a085aab803abc251776a33217270bd2929d672db6fd3a1e1f821b857e6c976",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918245059bc6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a752643a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json
index 8d82db9ca..330d10fbe 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_1_155000_d0g0v0_EIP150" : {
+    "modexp_1_0_1_155000_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/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xe05b3cc83f639d56a48b7c7067f47de8a46b33d57454db66c54bea1fc3cd1bb1",
-                    "mixHash" : "0x040cae336ef793111b5dab14beba48b3636b2ea12dec71ff18e995a9d12f1f6e",
-                    "nonce" : "0x56254b0794522e10",
+                    "hash" : "0xa396f68c60aaa062b4d78b64c4cebde6b971444e5b6475c12ad04c2476a69e6c",
+                    "mixHash" : "0xb2ad6707e47df3370c1200bb5fb71f1267aa60f92546414f0854e52ccf426eb5",
+                    "nonce" : "0xb4c821cd10933462",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0040cae336ef793111b5dab14beba48b3636b2ea12dec71ff18e995a9d12f1f6e8856254b0794522e10f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b2ad6707e47df3370c1200bb5fb71f1267aa60f92546414f0854e52ccf426eb588b4c821cd10933462f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe05b3cc83f639d56a48b7c7067f47de8a46b33d57454db66c54bea1fc3cd1bb1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa396f68c60aaa062b4d78b64c4cebde6b971444e5b6475c12ad04c2476a69e6c",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_1_155000_d0g0v0_EIP158" : {
+    "modexp_1_0_1_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x0bdee5dc6069af153116a8d559638b921e8c0541369a9b0ace9d424ea699d4df",
+                    "mixHash" : "0xa595a400c8eace745ab88a0c2e6692adc61661a12f08e3a61af72a86501df2e3",
+                    "nonce" : "0x94d800d2fe88e839",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a595a400c8eace745ab88a0c2e6692adc61661a12f08e3a61af72a86501df2e38894d800d2fe88e839f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b510",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5",
+                        "s" : "0x6fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0bdee5dc6069af153116a8d559638b921e8c0541369a9b0ace9d424ea699d4df",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_1_155000_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/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xc0ddbd73c1b26ff348bff5b7da949ca419cb4e1eb0ff8a0a14e03381ef73929c",
-                    "mixHash" : "0x60b3b77b3dc609d2e7ce76db2922932aad2d4f05133e85edf3b96fd615716337",
-                    "nonce" : "0x2d5daeff172d7ab8",
+                    "hash" : "0xc2900d63ea5b60d3883b20eb120b4bbe295eeff9246ee345e018bd0e8e575146",
+                    "mixHash" : "0x92ac675d4bcc9ffbedab9ec7f3f17e8264e4ab453d66f3de591278f51af2b17a",
+                    "nonce" : "0xcf5bf3bd081b7550",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a060b3b77b3dc609d2e7ce76db2922932aad2d4f05133e85edf3b96fd615716337882d5daeff172d7ab8f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a092ac675d4bcc9ffbedab9ec7f3f17e8264e4ab453d66f3de591278f51af2b17a88cf5bf3bd081b7550f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0ddbd73c1b26ff348bff5b7da949ca419cb4e1eb0ff8a0a14e03381ef73929c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc2900d63ea5b60d3883b20eb120b4bbe295eeff9246ee345e018bd0e8e575146",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_1_155000_d0g0v0_Frontier" : {
+    "modexp_1_0_1_155000_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/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b510",
-                    "hash" : "0x242b64f9325b140014382be9b6f2d17a6bff3d85cecc71f34c01820e85330808",
-                    "mixHash" : "0x48c6d638d1f05c049a03bb002f01abc2e5703b831057a1e0881ba320f0b2931f",
-                    "nonce" : "0xb5a423b62003bae6",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x1022501cce71652537f17dd632131acde21ce964d910b55ca4c594b0be293783",
+                    "mixHash" : "0xc2997cabace928bbeea49cfbf68250efa60d56a383fff1b088c08b6a1b32d1a1",
+                    "nonce" : "0x5fe1a2c0a9936d7c",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x2c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039e",
-                    "stateRoot" : "0x01376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421ada",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a048c6d638d1f05c049a03bb002f01abc2e5703b831057a1e0881ba320f0b2931f88b5a423b62003bae6f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0c2997cabace928bbeea49cfbf68250efa60d56a383fff1b088c08b6a1b32d1a1885fe1a2c0a9936d7cf90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x242b64f9325b140014382be9b6f2d17a6bff3d85cecc71f34c01820e85330808",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1022501cce71652537f17dd632131acde21ce964d910b55ca4c594b0be293783",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b6fe",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4902",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_1_155000_d0g0v0_Homestead" : {
+    "modexp_1_0_1_155000_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/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b510",
-                    "hash" : "0x6051fa13e3cd3085994d9593ea6635cbc54b3cd6d567aa181832bd48f6b700ed",
-                    "mixHash" : "0x8bbd7d59c3b84389428c89f92486558ac82bb823b36c3a1039172afa2de502fb",
-                    "nonce" : "0x659c280831dc8fbc",
+                    "hash" : "0xd49419c4c328a5a30c911d6257da66ee1ecc4b5c14a21027b68ca6739704ff24",
+                    "mixHash" : "0x73cddd32dc50255ffbe19660c03c538405cd61dc1af36d4dce9beed9ffa832d6",
+                    "nonce" : "0x01b24149a90fc5e9",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x2c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039e",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a08bbd7d59c3b84389428c89f92486558ac82bb823b36c3a1039172afa2de502fb88659c280831dc8fbcf90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a073cddd32dc50255ffbe19660c03c538405cd61dc1af36d4dce9beed9ffa832d68801b24149a90fc5e9f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6051fa13e3cd3085994d9593ea6635cbc54b3cd6d567aa181832bd48f6b700ed",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd49419c4c328a5a30c911d6257da66ee1ecc4b5c14a21027b68ca6739704ff24",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_1_155000_d0g0v0_Metropolis" : {
+    "modexp_1_0_1_155000_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/stPreCompiledContracts/modexp_1_0_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0x881d7d42fbb6445d670ba5cf4c86e01ed31fef938b6bebc268dc49667ebb5b27",
-                    "mixHash" : "0xb46e24429cf4558a752cc158a53ac0abaf1e636a7b30257a98424eb3dc6b676c",
-                    "nonce" : "0xd57fecd67d97a9f7",
+                    "gasUsed" : "0x02b510",
+                    "hash" : "0x6cc90bb6afe00049536fb0cca0c98e4452eec68f770eb7654cd4ca2465365ac0",
+                    "mixHash" : "0xc02c7a599148d2a3e4c458f3f1df65192601489a1251830f5f99068d1eac3598",
+                    "nonce" : "0x88c9b181a511c687",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x2c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039e",
+                    "stateRoot" : "0x01376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421ada",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x93f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0b46e24429cf4558a752cc158a53ac0abaf1e636a7b30257a98424eb3dc6b676c88d57fecd67d97a9f7f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
+                "rlp" : "0xf90328f901f9a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a001376941b98df265c3bd3cc9606d246d8f3777c47c3581309131d4895c421adaa093f522902e8c1a13858bb61f218097f960b191e3be8f86071f9d17015b882e38a02c8533b152eb692d418f26666a98114cb6b34a24d7313158bcbcf053cc6b039eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5108203e880a0c02c7a599148d2a3e4c458f3f1df65192601489a1251830f5f99068d1eac35988888c9b181a511c687f90128f9012501018302b51094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba05c0896b3162759589bbece91bd2976f1a675f0f4be6d90aa211eb9208d748cc5a06fcf3111ee39878e7d4563763ea2c1ec3c76ee71624cbb711625cffeb6349624c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x881d7d42fbb6445d670ba5cf4c86e01ed31fef938b6bebc268dc49667ebb5b27",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6cc90bb6afe00049536fb0cca0c98e4452eec68f770eb7654cd4ca2465365ac0",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f8b6fe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a75f4902",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json
index 8de22d1dd..6257c8839 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_1_20500_d0g0v0_EIP150" : {
+    "modexp_1_0_1_20500_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/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x73176950bc6941cb2411e46d0e74e467c2f6bceeff9dc916dbe92fa980f8c22e",
-                    "mixHash" : "0xb1fba18545bd14bb85bea5d73ff2f684788423483201b43d954015b805907622",
-                    "nonce" : "0x665619899970e6d3",
+                    "hash" : "0xace83c3d985c7be07d989513d0e7ce3b2195e421986566cb8c5c4e6352caaaee",
+                    "mixHash" : "0x64c6a9ed345e7a3965cff0f2211ae1b3645732eee3f08d9eee3e6be7e00a3b2f",
+                    "nonce" : "0x224842d49bc5ba64",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
-                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
+                    "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
+                    "stateRoot" : "0xb1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0b1fba18545bd14bb85bea5d73ff2f684788423483201b43d954015b80590762288665619899970e6d3f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7a096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a064c6a9ed345e7a3965cff0f2211ae1b3645732eee3f08d9eee3e6be7e00a3b2f88224842d49bc5ba64f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73176950bc6941cb2411e46d0e74e467c2f6bceeff9dc916dbe92fa980f8c22e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xace83c3d985c7be07d989513d0e7ce3b2195e421986566cb8c5c4e6352caaaee",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a99a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_1_0_1_20500_d0g0v0_EIP158" : {
+    "modexp_1_0_1_20500_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/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x5226d38a4fec5161d80fe4f822ce0e4341a32595fb9ff9c7289369196d9796ff",
-                    "mixHash" : "0x9c97ae456c98e050ac0f848373cbe562482bee95b8e7accc9206174ddcce3c32",
-                    "nonce" : "0xaa3f97ae391be04d",
+                    "hash" : "0x29489bfbce4b63913b9e83dd84916a35d9cbb2665e22e7786a779694352c4366",
+                    "mixHash" : "0xf80d82c6b3427642515ff7745e9fba4a86d85c298cc92786678e338b293c3ba1",
+                    "nonce" : "0x703284cb036bab1a",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
-                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
+                    "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
+                    "stateRoot" : "0xb1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a09c97ae456c98e050ac0f848373cbe562482bee95b8e7accc9206174ddcce3c3288aa3f97ae391be04df90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7a096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0f80d82c6b3427642515ff7745e9fba4a86d85c298cc92786678e338b293c3ba188703284cb036bab1af90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5226d38a4fec5161d80fe4f822ce0e4341a32595fb9ff9c7289369196d9796ff",
-        "network" : "EIP158",
+        "lastblockhash" : "0x29489bfbce4b63913b9e83dd84916a35d9cbb2665e22e7786a779694352c4366",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6a99a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_1_0_1_20500_d0g0v0_Frontier" : {
+    "modexp_1_0_1_20500_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/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0xd9d3c9c452cde5f53e0614ba323eb3baefec231f935dcc7243e1cb86b2ba66bf",
-                    "mixHash" : "0xa2d880d26fd6cd17ede7db5447557ade08b9d8a3a442bc306f87ebe683d27b5b",
-                    "nonce" : "0xdbac6e89351e5367",
+                    "hash" : "0xa4395ef79b788f5291d0508446bfcab86d733f6f845634efb7369ef9fa890697",
+                    "mixHash" : "0xbe7fc6da55f2ce51d010ba0a7ea8f6802991659363a18012a6132d827c6be2d2",
+                    "nonce" : "0x14a6430f16910663",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0a2d880d26fd6cd17ede7db5447557ade08b9d8a3a442bc306f87ebe683d27b5b88dbac6e89351e5367f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0be7fc6da55f2ce51d010ba0a7ea8f6802991659363a18012a6132d827c6be2d28814a6430f16910663f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9d3c9c452cde5f53e0614ba323eb3baefec231f935dcc7243e1cb86b2ba66bf",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa4395ef79b788f5291d0508446bfcab86d733f6f845634efb7369ef9fa890697",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_1_0_1_20500_d0g0v0_Homestead" : {
+    "modexp_1_0_1_20500_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/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x3a251613912671fa8a72c8c33c322414c1cb2a33dcf13ddb14ec1d049b85af86",
-                    "mixHash" : "0xedc7deb04ea171214295510a5e088c12a31fa3489d66098c794519eb0a3249e8",
-                    "nonce" : "0x1ee014a1df964614",
+                    "hash" : "0x33a582ff0a43689676dac574eecc1441555680236ac8ee83df62f5a105dc84b7",
+                    "mixHash" : "0x225022f85d02c89db22d6f1b3f7ae0d41f9f1036f6a5d93454b5cbc961ba4cee",
+                    "nonce" : "0x113037c72bf9d127",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0edc7deb04ea171214295510a5e088c12a31fa3489d66098c794519eb0a3249e8881ee014a1df964614f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0225022f85d02c89db22d6f1b3f7ae0d41f9f1036f6a5d93454b5cbc961ba4cee88113037c72bf9d127f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a251613912671fa8a72c8c33c322414c1cb2a33dcf13ddb14ec1d049b85af86",
-        "network" : "Homestead",
+        "lastblockhash" : "0x33a582ff0a43689676dac574eecc1441555680236ac8ee83df62f5a105dc84b7",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_1_0_1_20500_d0g0v0_Metropolis" : {
+    "modexp_1_0_1_20500_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/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7ac",
-                    "hash" : "0x7bc54c721f35d90888b8488ac2172e67aa7be2b632d82d866a02f2c1e6ca8cbb",
-                    "mixHash" : "0xff28e318ba05ab7d340391e15e5729f9f3d7cd315a8c18000e5aacc28ffb656c",
-                    "nonce" : "0x61c7047007cf30da",
+                    "hash" : "0xe01be07cb7a9f20a125c78552f32c3a1c1b69fdbd69acc9217833d0ded359a8c",
+                    "mixHash" : "0x99521668d76e5caae1efc8ecbcb93d1abfc1cc7fc1a49e2a0b4f10b6672a8bd0",
+                    "nonce" : "0x1af10a9868180876",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x6f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271db",
-                    "stateRoot" : "0xb1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7",
+                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
+                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1db4b1614b28cd14470c83e88c1d7bb04748cf9cee6398df99b935e9ddb24a7a096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a06f4316f7db8044d8a72c0e11cfd3c3d6dcb136efe778d036bb62e821462271dbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0ff28e318ba05ab7d340391e15e5729f9f3d7cd315a8c18000e5aacc28ffb656c8861c7047007cf30daf90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a099521668d76e5caae1efc8ecbcb93d1abfc1cc7fc1a49e2a0b4f10b6672a8bd0881af10a9868180876f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bc54c721f35d90888b8488ac2172e67aa7be2b632d82d866a02f2c1e6ca8cbb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe01be07cb7a9f20a125c78552f32c3a1c1b69fdbd69acc9217833d0ded359a8c",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6a99a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615666",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_1_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_1_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa7ac",
+                    "hash" : "0xfa2fea51c65435cb58b80bccc879ad9bad57696d3d26c947a8fcbea7d36aac16",
+                    "mixHash" : "0xaecc8a4b27837fa6b0cc66348cb6c8749f8e716cb1395c001c10ce49d96c9ecc",
+                    "nonce" : "0x087c5b08a44268a6",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0x8c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3",
+                    "stateRoot" : "0x0e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918ade",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x96d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00e4b38e0a95fe4494d0c40b310214de796c22933392f439cf2cca02c55918adea096d4f7339cb5796d27285b4d677898706f83ebdb4a3e17416a1c12e1e33cac74a08c5958a0ac20258ce8dbac28c8a3ed41ab8bf0d25c4f9828f418c94e65ec99b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7ac8203e880a0aecc8a4b27837fa6b0cc66348cb6c8749f8e716cb1395c001c10ce49d96c9ecc88087c5b08a44268a6f90127f90124010182a7ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba01fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91a05d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42ccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa7ac",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x1fb9ed1fc895812cc7a1a81ccb86e1b5bee91af7eb4dce6830f57e80ea517b91",
+                        "s" : "0x5d221351aa17fa5d7ea48601d12bfaa7e883eff8971327d01f87659af61c42cc",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa2fea51c65435cb58b80bccc879ad9bad57696d3d26c947a8fcbea7d36aac16",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json
index 965441bc6..fc453917a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_1_22000_d0g0v0_EIP150" : {
+    "modexp_1_0_1_22000_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/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x04d75272000b9ee79d77e57a70cc790a88819adc1f2810fbf4a0a9735ff862fa",
-                    "mixHash" : "0x58d534a950a9219b0bcb0e513bf8cf9ad9be2d2054eeea651b052e4e0445364c",
-                    "nonce" : "0x57a5a7a656de56d9",
+                    "hash" : "0xdd5f4387b229b63a31456005c55494ba21f595d2f63b537c48293662f477254d",
+                    "mixHash" : "0x6aaa49cf368adbc77b8c524aaf51ecb2225238010e96e227fbf5ea4629e612f3",
+                    "nonce" : "0x404de6acedb4af01",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a058d534a950a9219b0bcb0e513bf8cf9ad9be2d2054eeea651b052e4e0445364c8857a5a7a656de56d9f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a06aaa49cf368adbc77b8c524aaf51ecb2225238010e96e227fbf5ea4629e612f388404de6acedb4af01f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04d75272000b9ee79d77e57a70cc790a88819adc1f2810fbf4a0a9735ff862fa",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdd5f4387b229b63a31456005c55494ba21f595d2f63b537c48293662f477254d",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_1_22000_d0g0v0_EIP158" : {
+    "modexp_1_0_1_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xb9ab2b6cdb7b1308acc697dbdadb2a1f3426f4e2f60585b1708d8b48daa26b35",
+                    "mixHash" : "0x49d50dc2ad305d7841a97bc01cbeaefd8f21b38812cdb9ed5d7f03d4e789caec",
+                    "nonce" : "0xdf1945fc82f64883",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a049d50dc2ad305d7841a97bc01cbeaefd8f21b38812cdb9ed5d7f03d4e789caec88df1945fc82f64883f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xad88",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4",
+                        "s" : "0x168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb9ab2b6cdb7b1308acc697dbdadb2a1f3426f4e2f60585b1708d8b48daa26b35",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_1_22000_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/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xafa8c7f81cf860f79bd24f0f0110d2d3b984f3e86584a98a0440c21e3d6d4e3f",
-                    "mixHash" : "0x7c0eb455e87e705885af4aa85b21aa9323f822ebb4adddda51ce78f44c54eb51",
-                    "nonce" : "0xa1d03f9b6bd9fc88",
+                    "hash" : "0x57754935641b55bb134d5baa13b194ae001fde3a181b02a4cf4f0f3550eb9580",
+                    "mixHash" : "0x24e7d05ef90715c91381b2c68eaec6cdcdfb11ae74a344c63ab7df83e54f6764",
+                    "nonce" : "0x9652fb04c6ae4674",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a07c0eb455e87e705885af4aa85b21aa9323f822ebb4adddda51ce78f44c54eb5188a1d03f9b6bd9fc88f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a024e7d05ef90715c91381b2c68eaec6cdcdfb11ae74a344c63ab7df83e54f6764889652fb04c6ae4674f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafa8c7f81cf860f79bd24f0f0110d2d3b984f3e86584a98a0440c21e3d6d4e3f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x57754935641b55bb134d5baa13b194ae001fde3a181b02a4cf4f0f3550eb9580",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_1_22000_d0g0v0_Frontier" : {
+    "modexp_1_0_1_22000_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/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad88",
-                    "hash" : "0x4a4dc58cab7c06ffe0c233d6095e04f83a206a68cbfc6afb3084c0e879983071",
-                    "mixHash" : "0x3aadda35b9323a2f7ad3e7c9846d4b7508260848039b1ea274deba4d5bc34291",
-                    "nonce" : "0x3f0c9ade1a81cf39",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xcd66e3834f324aac6732f9c540cddef860bc399ddf4f8bf74d55833f96207106",
+                    "mixHash" : "0x0a1fb83d903edd8246a808100015459c32de6907d3ce620feeaec7f24fc9a33c",
+                    "nonce" : "0xb77ec5390df78370",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xaac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39",
-                    "stateRoot" : "0x1179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a03aadda35b9323a2f7ad3e7c9846d4b7508260848039b1ea274deba4d5bc34291883f0c9ade1a81cf39f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a00a1fb83d903edd8246a808100015459c32de6907d3ce620feeaec7f24fc9a33c88b77ec5390df78370f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a4dc58cab7c06ffe0c233d6095e04f83a206a68cbfc6afb3084c0e879983071",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcd66e3834f324aac6732f9c540cddef860bc399ddf4f8bf74d55833f96207106",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af76",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761508a",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_1_22000_d0g0v0_Homestead" : {
+    "modexp_1_0_1_22000_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/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad88",
-                    "hash" : "0x5aaebc5f980801fa30c174bfa2416d85156a4f83e40cd2ee944cdd6da2bf43ba",
-                    "mixHash" : "0x38f1c0579d7fb1e6977ec839a1b7dea2b54022737ce41df05e722a7b5c52f6f1",
-                    "nonce" : "0x0835774039d29eed",
+                    "hash" : "0xe60f1d5b1a1408297f5ebd209bcd735ad0e31e9a7345c4b04e261c0df0d1e7e3",
+                    "mixHash" : "0x022de9d7b55e850371fd25f12e60974c09e305907520a63f4d984560936733b8",
+                    "nonce" : "0x51fc79a66dee6653",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0xaac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a038f1c0579d7fb1e6977ec839a1b7dea2b54022737ce41df05e722a7b5c52f6f1880835774039d29eedf90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a0022de9d7b55e850371fd25f12e60974c09e305907520a63f4d984560936733b88851fc79a66dee6653f90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5aaebc5f980801fa30c174bfa2416d85156a4f83e40cd2ee944cdd6da2bf43ba",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe60f1d5b1a1408297f5ebd209bcd735ad0e31e9a7345c4b04e261c0df0d1e7e3",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_1_22000_d0g0v0_Metropolis" : {
+    "modexp_1_0_1_22000_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/stPreCompiledContracts/modexp_1_0_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0x58f4940a0eaf4b94af959e3c13df7bc0bd8beee297021ee72031a27105c3024d",
-                    "mixHash" : "0xa3b1eb8cb85e066516207e3a1df0c366af218a8643023ffea8be779f0965b5d9",
-                    "nonce" : "0xd55a2ea54fdc7a1f",
+                    "gasUsed" : "0xad88",
+                    "hash" : "0x8e8d1e7cdf879b72e044aa61cf38c1276d015254b1107888edcaf28b04ea52cf",
+                    "mixHash" : "0x990d2be12806f27d09be731592a3a68e140960ecb9d1c9fd82e04c35b37521d6",
+                    "nonce" : "0x45281ae2fd2184bc",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0xaac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39",
+                    "stateRoot" : "0x1179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x06f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a3b1eb8cb85e066516207e3a1df0c366af218a8643023ffea8be779f0965b5d988d55a2ea54fdc7a1ff90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01179502c165cf1681cd5a23d44761f1b8ee934c4a9883b6f05a155e201f524f9a006f4856bbfcbcae3c821a1cb8c185349c6f25020249e2ee4163d82d527002561a0aac9bd7bd51570a02aecdebc0ca28de84f2b71865ab44a15c39c6c5830f47b39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad888203e880a0990d2be12806f27d09be731592a3a68e140960ecb9d1c9fd82e04c35b37521d68845281ae2fd2184bcf90127f90124010182ad8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ca0793120c5e74122d639c77ebb29690a392c18508654b481f2773d6636a99396f4a0168b594aafac318f9c295bccbb27941e784b74f0b97ae55bc9ef936e2021d74ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58f4940a0eaf4b94af959e3c13df7bc0bd8beee297021ee72031a27105c3024d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8e8d1e7cdf879b72e044aa61cf38c1276d015254b1107888edcaf28b04ea52cf",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f6af76",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a761508a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json
index 51b17332e..3b1415eeb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_1_25000_d0g0v0_EIP150" : {
+    "modexp_1_0_1_25000_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/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x952081344953057491aade2ff382a0c9b3aef4a9d2449a6adfb3a1439c95eb8f",
-                    "mixHash" : "0x57a364667ae666ad2b3705eb47be1c9f69ae9663a1cc63a55755d459895ae98b",
-                    "nonce" : "0x6a944333c5ae70da",
+                    "hash" : "0xdd9c2d4f383bc7c98a1bc63672bd40b488e4ac8c0590c5de448c794e0fffad4e",
+                    "mixHash" : "0xce82c98b557e0b73060829a4e21589829c9060a43b8794345843168fcf4571f1",
+                    "nonce" : "0x1f250dd021c8bfa0",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a057a364667ae666ad2b3705eb47be1c9f69ae9663a1cc63a55755d459895ae98b886a944333c5ae70daf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ce82c98b557e0b73060829a4e21589829c9060a43b8794345843168fcf4571f1881f250dd021c8bfa0f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x952081344953057491aade2ff382a0c9b3aef4a9d2449a6adfb3a1439c95eb8f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdd9c2d4f383bc7c98a1bc63672bd40b488e4ac8c0590c5de448c794e0fffad4e",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_1_25000_d0g0v0_EIP158" : {
+    "modexp_1_0_1_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x3976f8ae8a98fc9013a535521535d86b9eeb0f06b7afa0f66b5a58059f48a783",
+                    "mixHash" : "0x21f93f0a43e647616cac0c6f4a166d705913a86fd5fd18226fba53877b6aa1ea",
+                    "nonce" : "0x8561b80d9b7772db",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a021f93f0a43e647616cac0c6f4a166d705913a86fd5fd18226fba53877b6aa1ea888561b80d9b7772dbf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb940",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x89e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846a",
+                        "s" : "0x1004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3976f8ae8a98fc9013a535521535d86b9eeb0f06b7afa0f66b5a58059f48a783",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_1_25000_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/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x23c2983006c3e00557c1bffd903977d129302ac8039cfc9999b6a87f3c09e9fd",
-                    "mixHash" : "0xe6316370163f40ed53ed5444d1b77637be0a0f4c3ea0bf17fd974f90b5434893",
-                    "nonce" : "0x5dcf74a6aa235d7d",
+                    "hash" : "0x1212c38435098b851451a1519a5e7e0cad1e0a18f642cb16ba1726cf03cfbaa6",
+                    "mixHash" : "0x4507e34cfaeb96f323b409c7b8c5c2eea6dc68114bba7cc73b90fba5b84f36ca",
+                    "nonce" : "0x6efc7e75d4525ea5",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0e6316370163f40ed53ed5444d1b77637be0a0f4c3ea0bf17fd974f90b5434893885dcf74a6aa235d7df90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a04507e34cfaeb96f323b409c7b8c5c2eea6dc68114bba7cc73b90fba5b84f36ca886efc7e75d4525ea5f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23c2983006c3e00557c1bffd903977d129302ac8039cfc9999b6a87f3c09e9fd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1212c38435098b851451a1519a5e7e0cad1e0a18f642cb16ba1726cf03cfbaa6",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_1_25000_d0g0v0_Frontier" : {
+    "modexp_1_0_1_25000_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/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb940",
-                    "hash" : "0xa9238a36ae2be5b0197e7548ae5ac67918b95e2a817ac0f5be287b2a6231acc2",
-                    "mixHash" : "0xa2547ab4a9cffb89b78dc28c8875602076d51c0fb1a6ae8da94a575172585018",
-                    "nonce" : "0x53a3da2a6836d64c",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xfb75a50b89cd2f5385aad6fa52e89331b4ddf87fcb05b9ebec87712a68be0cda",
+                    "mixHash" : "0xff5c7b1b8bc65246b7214cd1379267485db07b6cf6ffa75b6a4e24c9ecc8eb86",
+                    "nonce" : "0xdd1e7eb5a6a08b7d",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x93314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdb",
-                    "stateRoot" : "0xcd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66f",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a0a2547ab4a9cffb89b78dc28c8875602076d51c0fb1a6ae8da94a5751725850188853a3da2a6836d64cf90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ff5c7b1b8bc65246b7214cd1379267485db07b6cf6ffa75b6a4e24c9ecc8eb8688dd1e7eb5a6a08b7df90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9238a36ae2be5b0197e7548ae5ac67918b95e2a817ac0f5be287b2a6231acc2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfb75a50b89cd2f5385aad6fa52e89331b4ddf87fcb05b9ebec87712a68be0cda",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bb2e",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76144d2",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_1_25000_d0g0v0_Homestead" : {
+    "modexp_1_0_1_25000_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/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb940",
-                    "hash" : "0x7d958f81e6c69b66171b3413986c24eb6d8ab6c6b6ad693e8a27c3f298219bf0",
-                    "mixHash" : "0x212335b91a8685515852357712979628ba082f0f54f5ba4d35eda51906df48d0",
-                    "nonce" : "0xa9d1f071c142019e",
+                    "hash" : "0x5d76269a60f2c9da18b0d318fa556d42e0ded49dc6141f401dc9b4771df0157e",
+                    "mixHash" : "0x474062f25200c8f029a675106fa0a3d05fb6f4f6e6aa836db2c9c93c4b410faf",
+                    "nonce" : "0x8e80672b52e495a5",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x93314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdb",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a0212335b91a8685515852357712979628ba082f0f54f5ba4d35eda51906df48d088a9d1f071c142019ef90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a0474062f25200c8f029a675106fa0a3d05fb6f4f6e6aa836db2c9c93c4b410faf888e80672b52e495a5f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d958f81e6c69b66171b3413986c24eb6d8ab6c6b6ad693e8a27c3f298219bf0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5d76269a60f2c9da18b0d318fa556d42e0ded49dc6141f401dc9b4771df0157e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_1_25000_d0g0v0_Metropolis" : {
+    "modexp_1_0_1_25000_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/stPreCompiledContracts/modexp_1_0_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0xbd321aac3893ff84e11df15ada41446a5d939d392606c71f2bc1d64b278dec22",
-                    "mixHash" : "0x0ac807dc0a904e22d51156ada67d1977391906e48ebe15f85c048dc911aa63b5",
-                    "nonce" : "0x0db4aef4c393aebf",
+                    "gasUsed" : "0xb940",
+                    "hash" : "0x200319e259bfd15609b66cbc8aec9e803f36ad99142db68102faf400e7a9eacf",
+                    "mixHash" : "0xc72a1f1451a999139ca3030991be93fa2c2db4c9f4779a991c9e2d005d49184e",
+                    "nonce" : "0xc188a915049ed688",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x93314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdb",
+                    "stateRoot" : "0xcd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a00ac807dc0a904e22d51156ada67d1977391906e48ebe15f85c048dc911aa63b5880db4aef4c393aebff90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cd2b4f27097c9f145066687b47e50709799f81a41f4e79041d5ee5606793f66fa0dbb15b153a82d98967c26fa85d1ade94b60afed91dd69ebbfb755fb9f1e5e6c5a093314ead2dfa0847df8dac3bdc4044aedc6b2cc2fae840909bfcbe06092b9bdbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9408203e880a0c72a1f1451a999139ca3030991be93fa2c2db4c9f4779a991c9e2d005d49184e88c188a915049ed688f90127f90124010182b94094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba089e5477aeae90468db70ef3a5efdae8fb8573d6e86c05006f0481775f16f846aa01004b00183a6dea4deef072c2bd3c978b3a467bc8a505379410a84c739ef5867c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd321aac3893ff84e11df15ada41446a5d939d392606c71f2bc1d64b278dec22",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x200319e259bfd15609b66cbc8aec9e803f36ad99142db68102faf400e7a9eacf",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f6bb2e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a76144d2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json
index d51340920..eca0093c7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_0_1_35000_d0g0v0_EIP150" : {
+    "modexp_1_0_1_35000_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/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0x39009894c0683528de66793cca092bc7adf9327ef4c66391a8ecb98116316181",
-                    "mixHash" : "0x7843c487a2840ee0b9a546571ba5740b68e4bfbcb71b14fc37ff09051af57fd4",
-                    "nonce" : "0x67245c44cdc794cb",
+                    "hash" : "0x79b46713e9eaaeeb9ca94b6025b68a9a00bbf59c164f51f1fe0c3d875ce343c3",
+                    "mixHash" : "0x15d81b2f86223f9922202822c71e9117d97b95509c0cd19ed54bc382727a7e2c",
+                    "nonce" : "0x698e9338ee54c06e",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
-                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a07843c487a2840ee0b9a546571ba5740b68e4bfbcb71b14fc37ff09051af57fd48867245c44cdc794cbf90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a015d81b2f86223f9922202822c71e9117d97b95509c0cd19ed54bc382727a7e2c88698e9338ee54c06ef90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39009894c0683528de66793cca092bc7adf9327ef4c66391a8ecb98116316181",
-        "network" : "EIP150",
+        "lastblockhash" : "0x79b46713e9eaaeeb9ca94b6025b68a9a00bbf59c164f51f1fe0c3d875ce343c3",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aeff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_0_1_35000_d0g0v0_EIP158" : {
+    "modexp_1_0_1_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0xfd6e0fe439a69f9eaf8242474f9c716718c76c97dfd584e8541900eb971228ce",
+                    "mixHash" : "0x94c5bd9b08559a36112f29812f10ababd35eee776bee6e8dcaa86c80670b6d64",
+                    "nonce" : "0x92098513dc06caf1",
+                    "number" : "0x01",
+                    "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
+                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a094c5bd9b08559a36112f29812f10ababd35eee776bee6e8dcaa86c80670b6d648892098513dc06caf1f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe050",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680",
+                        "s" : "0x1a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfd6e0fe439a69f9eaf8242474f9c716718c76c97dfd584e8541900eb971228ce",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aeff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615101",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_0_1_35000_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/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad11",
-                    "hash" : "0xe56f291fce28352279e208470a4f560e069a4ba2de983c5f91ac62a6a487e9d5",
-                    "mixHash" : "0xa1eb95b61acba005b917a3a86e5f45c6823fe9fbe5e0ce6c263e3b24bf5d56a3",
-                    "nonce" : "0x96c962416e3f75d2",
+                    "hash" : "0x3ab75e36763852beb40c03e7072ee6a664fabd0433dfacbaeff0f5673d86bd3c",
+                    "mixHash" : "0x97109309615ec9c76b7892a8029b20f997eb2b561a740a2530eda07173e7cc5a",
+                    "nonce" : "0xaabfdd3ec7e128da",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a1eb95b61acba005b917a3a86e5f45c6823fe9fbe5e0ce6c263e3b24bf5d56a38896c962416e3f75d2f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a097109309615ec9c76b7892a8029b20f997eb2b561a740a2530eda07173e7cc5a88aabfdd3ec7e128daf90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe56f291fce28352279e208470a4f560e069a4ba2de983c5f91ac62a6a487e9d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3ab75e36763852beb40c03e7072ee6a664fabd0433dfacbaeff0f5673d86bd3c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_0_1_35000_d0g0v0_Frontier" : {
+    "modexp_1_0_1_35000_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/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe050",
-                    "hash" : "0x8369c4ad1c81d6f85f66e9003611898049ff853b3f447032f3c82f9d47b20f91",
-                    "mixHash" : "0x5f8f1448480c9f0fd3bada34a5b08405c60a81d51d7c835df8d6ecf2c232a59f",
-                    "nonce" : "0xdb803466ddcd8b23",
+                    "gasUsed" : "0xad11",
+                    "hash" : "0x82f3af1e2487b2c2f2d62511528a3f2a32a1a5dda2a567287bc878e3eed9d1f5",
+                    "mixHash" : "0xad606f59a424484d1066aa25cfbdbe869c8890b39f251ea7f23f2b1ee66e2b88",
+                    "nonce" : "0xd89a27dedce6c054",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0x1b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9c",
-                    "stateRoot" : "0xc0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4",
+                    "receiptTrie" : "0x118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331",
+                    "stateRoot" : "0x781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a05f8f1448480c9f0fd3bada34a5b08405c60a81d51d7c835df8d6ecf2c232a59f88db803466ddcd8b23f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0781351908a5bc6a39a9a483fba2208b3ea026b345976df8423fd15e3322553e5a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0118852664a5ee730fc4f720a2c2df548e10f00f42f3b1d8d96ae0a105f8a3331b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0ad606f59a424484d1066aa25cfbdbe869c8890b39f251ea7f23f2b1ee66e2b8888d89a27dedce6c054f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8369c4ad1c81d6f85f66e9003611898049ff853b3f447032f3c82f9d47b20f91",
-        "network" : "Frontier",
+        "lastblockhash" : "0x82f3af1e2487b2c2f2d62511528a3f2a32a1a5dda2a567287bc878e3eed9d1f5",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e23e",
+                "balance" : "0x4563918244f6aeff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611dc2",
+                "balance" : "0x0de0b6b3a7615101",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_0_1_35000_d0g0v0_Homestead" : {
+    "modexp_1_0_1_35000_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/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe050",
-                    "hash" : "0x67f9c7e551359b71e2c63fce8c05ed99438056e35fd1947989e2d1d238172296",
-                    "mixHash" : "0x96a366f6ddc3630a1d0924e79ae31505b688765da4adebd50cb6b588f92939d7",
-                    "nonce" : "0x583af60c31ff0a0a",
+                    "hash" : "0x815160e429ea815bb49cb6afa427a73924a467d27396cf3431f4b5630409686d",
+                    "mixHash" : "0xabf7aa4c98a646270a125f5102bb720216082b465d34b31ee0eb2c1813f4af43",
+                    "nonce" : "0xff8929b63fd1a98d",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
                     "receiptTrie" : "0x1b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9c",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a096a366f6ddc3630a1d0924e79ae31505b688765da4adebd50cb6b588f92939d788583af60c31ff0a0af90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a0abf7aa4c98a646270a125f5102bb720216082b465d34b31ee0eb2c1813f4af4388ff8929b63fd1a98df90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67f9c7e551359b71e2c63fce8c05ed99438056e35fd1947989e2d1d238172296",
-        "network" : "Homestead",
+        "lastblockhash" : "0x815160e429ea815bb49cb6afa427a73924a467d27396cf3431f4b5630409686d",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_0_1_35000_d0g0v0_Metropolis" : {
+    "modexp_1_0_1_35000_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/stPreCompiledContracts/modexp_1_0_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad11",
-                    "hash" : "0xf02a4f10250d4cb5461c593be09d3e725ac923d1c2411177a2f81750bd217aca",
-                    "mixHash" : "0xa41e1d361ca55db484fba48fdbd719e8b6f4441190378f0ef7ed2f3814381efa",
-                    "nonce" : "0x6fa87fb697fb4a68",
+                    "gasUsed" : "0xe050",
+                    "hash" : "0xd5d165a41c3afa383109bf9bdb20aa901b32c2fcc0c11ca6992cf40c102b950c",
+                    "mixHash" : "0x896af84934b5e26753bd4f5b50333e4465a1adfa308b100d557f91f873a85022",
+                    "nonce" : "0x285566e1bce1d82c",
                     "number" : "0x01",
                     "parentHash" : "0x33dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7",
-                    "receiptTrie" : "0xda7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33f",
-                    "stateRoot" : "0x7d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3f",
+                    "receiptTrie" : "0x1b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9c",
+                    "stateRoot" : "0xc0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07d71ab9aea6396a6756413b18bea0a5adc3970f4eaf8adaf9e80f2dc9b62ef3fa05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea0da7c6e7afa7811440dc63a7bf5bdfec0a83bf38c79b90fc118fbce6cf54fb33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad118203e880a0a41e1d361ca55db484fba48fdbd719e8b6f4441190378f0ef7ed2f3814381efa886fa87fb697fb4a68f90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
+                "rlp" : "0xf90326f901f8a033dfb35c32724d1e3d2213d1e828fe92b1920437b61f9b8054cb2c254466bdd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0adf751d13e054981b7d1201bff6d47284ca38b59655323030b34703d7631a4a05e817d2631d6a6596385c44e2644be285e0b90992f93ae2409ef0745ece1741ea01b265ca3499e73f6255ef44a3b484f65da7a88fd83093ad76e523a82c1895d9cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0508203e880a0896af84934b5e26753bd4f5b50333e4465a1adfa308b100d557f91f873a8502288285566e1bce1d82cf90127f90124010182e05094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010000000000000000000000000000000000000000000000000000000000001ba0ea227a37a0663c444e4243534ad492a0e58bc233fc6a290203a7864f580f5680a01a81e0674f3e23bc4d906079a9759294ef0d0bf0fd83660bd269f5ab8b15a99dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07264b88677f27100d1b490a5884b15e13657277a25bc6dfdc3b256de81bc4c61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf02a4f10250d4cb5461c593be09d3e725ac923d1c2411177a2f81750bd217aca",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd5d165a41c3afa383109bf9bdb20aa901b32c2fcc0c11ca6992cf40c102b950c",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aeff",
+                "balance" : "0x4563918244f6e23e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615101",
+                "balance" : "0x0de0b6b3a7611dc2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json
index 00477ba4c..9d6d09c60 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_1_1_1000000_d0g0v0_EIP150" : {
+    "modexp_1_1_1_1000000_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/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x6d23de0af81b85dce158f659d01734c1d378874a84c38d6f4a895fae61b08b82",
-                    "mixHash" : "0xe439581d61c618e98656537c79e1e3d8550694b08077fea9f40fe024cbe68a3b",
-                    "nonce" : "0x26247fb08ae66c08",
+                    "hash" : "0x6bab678f032c2e1b3b24fefcc4fae08749d1403899b03bf63c41564422856f05",
+                    "mixHash" : "0xec023667cddca8d0705457696c83ad5a967708180d32fe09e53226146f0578ac",
+                    "nonce" : "0x2f674954e46f8dbb",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0e439581d61c618e98656537c79e1e3d8550694b08077fea9f40fe024cbe68a3b8826247fb08ae66c08f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ec023667cddca8d0705457696c83ad5a967708180d32fe09e53226146f0578ac882f674954e46f8dbbf90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d23de0af81b85dce158f659d01734c1d378874a84c38d6f4a895fae61b08b82",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6bab678f032c2e1b3b24fefcc4fae08749d1403899b03bf63c41564422856f05",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_1_1_1000000_d0g0v0_EIP158" : {
+    "modexp_1_1_1_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xd297bce564e12544c6d3bdcabf25b01cf7de89ae9cf485003aa24d17b5d73ba5",
+                    "mixHash" : "0xd9cf11768b8d877dc0b2c36dea4472e7f7be2b9e7adf2f153ac93f19139448d5",
+                    "nonce" : "0xa97c30a89e51de86",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0d9cf11768b8d877dc0b2c36dea4472e7f7be2b9e7adf2f153ac93f19139448d588a97c30a89e51de86f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9a58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x04012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40",
+                        "s" : "0x3ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd297bce564e12544c6d3bdcabf25b01cf7de89ae9cf485003aa24d17b5d73ba5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_1_1_1000000_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/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x6aab2a4a4c8ca6127168f0c43044b54ead8be418c7ac0ca4e4ada652bc88e89d",
-                    "mixHash" : "0x0b8adf14d863faef611102b86b72e1677a050d68cb29366ce74112a75f8cb267",
-                    "nonce" : "0xb03d02c1fc544498",
+                    "hash" : "0xa655859813c539a3b1ba3e3e8c5a504ed77cdd1b13b32e1bca64c42db41968cb",
+                    "mixHash" : "0x764c7ee162189dbaa1d9ad25e8499e57572994de10b94dffa386af0e4d97263e",
+                    "nonce" : "0x7b869ef4f36b5d8c",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a00b8adf14d863faef611102b86b72e1677a050d68cb29366ce74112a75f8cb26788b03d02c1fc544498f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0764c7ee162189dbaa1d9ad25e8499e57572994de10b94dffa386af0e4d97263e887b869ef4f36b5d8cf90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6aab2a4a4c8ca6127168f0c43044b54ead8be418c7ac0ca4e4ada652bc88e89d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa655859813c539a3b1ba3e3e8c5a504ed77cdd1b13b32e1bca64c42db41968cb",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_1_1_1000000_d0g0v0_Frontier" : {
+    "modexp_1_1_1_1000000_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/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9a58",
-                    "hash" : "0xde24a102859721126d766b9cf420081b071038fe9aeeef0bc29dabc8311d6feb",
-                    "mixHash" : "0x711bd360981b396adc23b831c18039b0882fdb1c745968f7d60cc4c438bcc610",
-                    "nonce" : "0x24edeceb978a370a",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x759f175d5e7cee145adefdda7365bbe13fe150b8ffff85ac7aa9873e59d6e095",
+                    "mixHash" : "0x0f721afa698ff9b7492655e1e29d58a96b49823fadb030c0a02d34873f18f1e6",
+                    "nonce" : "0x983b75d189dd4a7f",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x77eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603",
-                    "stateRoot" : "0x076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617a",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a0711bd360981b396adc23b831c18039b0882fdb1c745968f7d60cc4c438bcc6108824edeceb978a370af90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a00f721afa698ff9b7492655e1e29d58a96b49823fadb030c0a02d34873f18f1e688983b75d189dd4a7ff90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde24a102859721126d766b9cf420081b071038fe9aeeef0bc29dabc8311d6feb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x759f175d5e7cee145adefdda7365bbe13fe150b8ffff85ac7aa9873e59d6e095",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059c46",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75263ba",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_1_1_1000000_d0g0v0_Homestead" : {
+    "modexp_1_1_1_1000000_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/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9a58",
-                    "hash" : "0x5abb355e515709020372dc8c47b16d9198e03087d1169d10d65980fa4fce6944",
-                    "mixHash" : "0xf889eeb8b28abe1f0862f278eec6cf2690ca7077a9ac6ffcca0d28007600a686",
-                    "nonce" : "0xa1a5a15556b3f4e3",
+                    "hash" : "0xfeef226dd8fc2658e22bd29e165ec88bbdd97865f1c7ed175dd7c84cad8c831e",
+                    "mixHash" : "0xa7a3154e4833647a2758b9ba99ef009516811cc256b7ebada677d7a85e747c3f",
+                    "nonce" : "0x6dd6b2b3917f3b73",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x77eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a0f889eeb8b28abe1f0862f278eec6cf2690ca7077a9ac6ffcca0d28007600a68688a1a5a15556b3f4e3f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a0a7a3154e4833647a2758b9ba99ef009516811cc256b7ebada677d7a85e747c3f886dd6b2b3917f3b73f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5abb355e515709020372dc8c47b16d9198e03087d1169d10d65980fa4fce6944",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfeef226dd8fc2658e22bd29e165ec88bbdd97865f1c7ed175dd7c84cad8c831e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_1_1_1000000_d0g0v0_Metropolis" : {
+    "modexp_1_1_1_1000000_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/stPreCompiledContracts/modexp_1_1_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x0cafcd41049cc9f4ede4bdd6f936f75f4fc1affa02ae47a7cd704633c0dfc046",
-                    "mixHash" : "0x1ab5ec7d923e5760ce51efb08542074774786bba35e0a774206a33861cd75659",
-                    "nonce" : "0x8e56de0d5d14171a",
+                    "gasUsed" : "0x0f9a58",
+                    "hash" : "0xb2f8c86d6908b7de3da78a03717a98d7fed21438fb4820da48b93b08742dd00c",
+                    "mixHash" : "0xb633ea977c1883a3dfa25225da05efd24d10eb80045cb876469330bf3eb480e9",
+                    "nonce" : "0x68997746b883551f",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "receiptTrie" : "0x77eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603",
+                    "stateRoot" : "0x076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a01ab5ec7d923e5760ce51efb08542074774786bba35e0a774206a33861cd75659888e56de0d5d14171af90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0d3db9fefbf621e087f1cbb952f35abc550c4ed6ba8e7d879fe65d05d18a95134a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a0b633ea977c1883a3dfa25225da05efd24d10eb80045cb876469330bf3eb480e98868997746b883551ff90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba004012cef17dbff8fac18d1549d3ef53adaab67c885851cb3ed578bcbd965ff40a03ba79d98e2322015ef8a67be3b65c06d2e6cd45e011e1ad6d7e01f5cc67f9fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0cafcd41049cc9f4ede4bdd6f936f75f4fc1affa02ae47a7cd704633c0dfc046",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb2f8c86d6908b7de3da78a03717a98d7fed21438fb4820da48b93b08742dd00c",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918245059c46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a75263ba",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json
index b5c743f67..119d4ed94 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_1_1_155000_d0g0v0_EIP150" : {
+    "modexp_1_1_1_155000_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/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x3c0f418b8262e0256a99d8339a7acd7b600090d283d73d160ef198a4f646224e",
-                    "mixHash" : "0x6f03e6c89e2bd7c6c82bb5cc918d803c577b47eb96de16d07a90d8f0e82e6a8a",
-                    "nonce" : "0x065c009f226ac260",
+                    "hash" : "0x0f832d1dc17aa7f7d2707821313f05b23d8e4486ce2c39313d46fc543e05353a",
+                    "mixHash" : "0x9f64a9f2410996e7d46ac000ffbb2c1d8ad2c4d8dcc230d30c2c862b4816f543",
+                    "nonce" : "0x49ca223524c49baa",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a06f03e6c89e2bd7c6c82bb5cc918d803c577b47eb96de16d07a90d8f0e82e6a8a88065c009f226ac260f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a09f64a9f2410996e7d46ac000ffbb2c1d8ad2c4d8dcc230d30c2c862b4816f5438849ca223524c49baaf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c0f418b8262e0256a99d8339a7acd7b600090d283d73d160ef198a4f646224e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0f832d1dc17aa7f7d2707821313f05b23d8e4486ce2c39313d46fc543e05353a",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_1_1_155000_d0g0v0_EIP158" : {
+    "modexp_1_1_1_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x77c95133d6967d4bd28f2203a069ae2d383c82595977d5dfd085cd7727b5523e",
+                    "mixHash" : "0x48201bbaacb02e3a1a9adeabd6906e1a3f02e565998e5301897cfa208dfe889d",
+                    "nonce" : "0x41ee0e2edf80d88c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a048201bbaacb02e3a1a9adeabd6906e1a3f02e565998e5301897cfa208dfe889d8841ee0e2edf80d88cf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b590",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45df",
+                        "s" : "0x7b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x77c95133d6967d4bd28f2203a069ae2d383c82595977d5dfd085cd7727b5523e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_1_1_155000_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/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x51afa2d795cfa689fe783dbafd2ab85452d4556e1d8960e9a9cdc26f11527970",
-                    "mixHash" : "0x16a1a61ba252bb3eaf202328bc73db22e988cd69cf3f1c319239e4f5ca8af811",
-                    "nonce" : "0xb1223deb01125ef2",
+                    "hash" : "0xa2facface725976e5a5c8315ebb006c6685ccf9bfcd26061fb8bd7c421572ebe",
+                    "mixHash" : "0xb2895139805c3dca80bdad075ceaf897135e2205875edddc4d4fd0bc55a5a7c7",
+                    "nonce" : "0x830f815d044d5f1e",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a016a1a61ba252bb3eaf202328bc73db22e988cd69cf3f1c319239e4f5ca8af81188b1223deb01125ef2f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0b2895139805c3dca80bdad075ceaf897135e2205875edddc4d4fd0bc55a5a7c788830f815d044d5f1ef90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51afa2d795cfa689fe783dbafd2ab85452d4556e1d8960e9a9cdc26f11527970",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa2facface725976e5a5c8315ebb006c6685ccf9bfcd26061fb8bd7c421572ebe",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_1_1_155000_d0g0v0_Frontier" : {
+    "modexp_1_1_1_155000_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/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b590",
-                    "hash" : "0x7ea888496dc43188804f8f4ed16f9a934dff3a263282e3c8c7ddba8df665bd4f",
-                    "mixHash" : "0x3b35e062c46937754769c3e46e4a6b34edfe23e5de8d6f5e9b278c058bdb932b",
-                    "nonce" : "0x0a46314d76ff8fc0",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xcf52486a9194384e70cfe7c0d8a991757e453f37822078611e544b7611e5fc7f",
+                    "mixHash" : "0xbe7115cf36b102ee3c757c74965f425c3728da39083817d921c403814f7b54e3",
+                    "nonce" : "0x3e70ce4c5e6a4c9d",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5",
-                    "stateRoot" : "0xaeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a03b35e062c46937754769c3e46e4a6b34edfe23e5de8d6f5e9b278c058bdb932b880a46314d76ff8fc0f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0be7115cf36b102ee3c757c74965f425c3728da39083817d921c403814f7b54e3883e70ce4c5e6a4c9df90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ea888496dc43188804f8f4ed16f9a934dff3a263282e3c8c7ddba8df665bd4f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcf52486a9194384e70cfe7c0d8a991757e453f37822078611e544b7611e5fc7f",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b77e",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4882",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_1_1_155000_d0g0v0_Homestead" : {
+    "modexp_1_1_1_155000_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/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b590",
-                    "hash" : "0xd284f07baabef481a3e6962a71d27397c7138ec239fcd6f9ec00785e4d1db636",
-                    "mixHash" : "0xd3bbc8b203eb7bc1b97941f9874a81f57acd41e20bb60f6b660242b0396130a8",
-                    "nonce" : "0x00dde2f3bcf3cc5a",
+                    "hash" : "0x39d64ae8a4042b5be36e95450ddaf7d56f27f07634335a8d36e1333fa6e76625",
+                    "mixHash" : "0x513e30fb8fd15c3eda552f583a3337419acf4e58b053593045aff5736824777e",
+                    "nonce" : "0x8c37b55b7eca5872",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a0d3bbc8b203eb7bc1b97941f9874a81f57acd41e20bb60f6b660242b0396130a88800dde2f3bcf3cc5af90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a0513e30fb8fd15c3eda552f583a3337419acf4e58b053593045aff5736824777e888c37b55b7eca5872f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd284f07baabef481a3e6962a71d27397c7138ec239fcd6f9ec00785e4d1db636",
-        "network" : "Homestead",
+        "lastblockhash" : "0x39d64ae8a4042b5be36e95450ddaf7d56f27f07634335a8d36e1333fa6e76625",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_1_1_155000_d0g0v0_Metropolis" : {
+    "modexp_1_1_1_155000_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/stPreCompiledContracts/modexp_1_1_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x457e07b6c19226d52d2151763a6774cd57b8e10298519c7fd51add09c7f8771b",
-                    "mixHash" : "0x316ef2afdeedf9060a6ab776d32e6f70306777e0254db8d3a5bd1b761d7260c3",
-                    "nonce" : "0xc997c9a9473235f2",
+                    "gasUsed" : "0x02b590",
+                    "hash" : "0x0c2b984077fcbb7e5d3c6f6c14ceacdf74e1e858ae57c16a858047a5f42b4fd6",
+                    "mixHash" : "0x244da07be53a6d703901c9070bba05132b0148fde0700e04deec5d7bf0b8c5c5",
+                    "nonce" : "0x6154bc77ace39d49",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "receiptTrie" : "0x820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5",
+                    "stateRoot" : "0xaeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0316ef2afdeedf9060a6ab776d32e6f70306777e0254db8d3a5bd1b761d7260c388c997c9a9473235f2f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a03c556a289e0954811f03ca319440b834767f6de8615fe4f2b4a246b1bfc85ca0a0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a0244da07be53a6d703901c9070bba05132b0148fde0700e04deec5d7bf0b8c5c5886154bc77ace39d49f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0c4a78a977b6a4cbf3928a01c6e1785212af59c557b672afbb17e9ce09f5c45dfa07b864944e5a502a4402922b3b626f9ae2de85d52910469248bfbb2de2ba3ac39c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x457e07b6c19226d52d2151763a6774cd57b8e10298519c7fd51add09c7f8771b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0c2b984077fcbb7e5d3c6f6c14ceacdf74e1e858ae57c16a858047a5f42b4fd6",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f8b77e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a75f4882",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json
index 1db2368cb..5e1d420e9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_1_1_20500_d0g0v0_EIP150" : {
+    "modexp_1_1_1_20500_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/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0x73a94e10dc3d6b70116be4be147a9d5609d726d31a3aecc19460a559f116fb55",
-                    "mixHash" : "0x9b622101bc79c698a6c89650b0f7b4084a1ffd69f67a64b32fcc731ea740e684",
-                    "nonce" : "0xe6b95479a3a577a1",
+                    "hash" : "0x41bc521d095e0bdaed58c532980c6808bc8c005e7b5f47385531a327e24bdad7",
+                    "mixHash" : "0x321d3888fcf31a3129783a04670942d459dd8e4b8aac2576df5b3d18e2eac9dd",
+                    "nonce" : "0x82cc5779153351b4",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
-                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
+                    "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
+                    "stateRoot" : "0xb2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a09b622101bc79c698a6c89650b0f7b4084a1ffd69f67a64b32fcc731ea740e68488e6b95479a3a577a1f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29ca086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0321d3888fcf31a3129783a04670942d459dd8e4b8aac2576df5b3d18e2eac9dd8882cc5779153351b4f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73a94e10dc3d6b70116be4be147a9d5609d726d31a3aecc19460a559f116fb55",
-        "network" : "EIP150",
+        "lastblockhash" : "0x41bc521d095e0bdaed58c532980c6808bc8c005e7b5f47385531a327e24bdad7",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aa1a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_1_1_1_20500_d0g0v0_EIP158" : {
+    "modexp_1_1_1_20500_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/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0x5cc239807fa9f1865aa1583e571023ba2a307608478dfed04848781b1df8fe3b",
-                    "mixHash" : "0xfe655420d1aeb4601c25835b9f9d2e8eb4760d450c7ceeb2214e178574193714",
-                    "nonce" : "0x018f3026319223f4",
+                    "hash" : "0x01e6bf166b7cc1fa63699059bc443bb938d01216e1373037e02cea9f37f5ea15",
+                    "mixHash" : "0xdd645f09263fd79eba2dfb0594f938dc5905439c43cf78a32c953a9533657fb7",
+                    "nonce" : "0x21db58e5ee316627",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
-                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
+                    "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
+                    "stateRoot" : "0xb2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0fe655420d1aeb4601c25835b9f9d2e8eb4760d450c7ceeb2214e17857419371488018f3026319223f4f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29ca086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0dd645f09263fd79eba2dfb0594f938dc5905439c43cf78a32c953a9533657fb78821db58e5ee316627f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cc239807fa9f1865aa1583e571023ba2a307608478dfed04848781b1df8fe3b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x01e6bf166b7cc1fa63699059bc443bb938d01216e1373037e02cea9f37f5ea15",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aa1a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_1_1_1_20500_d0g0v0_Frontier" : {
+    "modexp_1_1_1_20500_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/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0x4a97655354e214254a06154be70e73f678d55f8462617aa5157101f677bc6ad6",
-                    "mixHash" : "0xc6b6136078937716732e118faa752431601bde86b19885936c955f2c4de0d72b",
-                    "nonce" : "0x448d5ce6612087db",
+                    "hash" : "0x83169b3bcdbfefc1f69e85c66b8bf1f7c6a559f94e63c2c404bc1972f82854f0",
+                    "mixHash" : "0xacd883df1b51e3da7cac959b29ded28c1c890c5fb8495529824f0e79ab5836ac",
+                    "nonce" : "0x77cda6b7a7ffb93a",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0c6b6136078937716732e118faa752431601bde86b19885936c955f2c4de0d72b88448d5ce6612087dbf90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0acd883df1b51e3da7cac959b29ded28c1c890c5fb8495529824f0e79ab5836ac8877cda6b7a7ffb93af90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a97655354e214254a06154be70e73f678d55f8462617aa5157101f677bc6ad6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x83169b3bcdbfefc1f69e85c66b8bf1f7c6a559f94e63c2c404bc1972f82854f0",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_1_1_1_20500_d0g0v0_Homestead" : {
+    "modexp_1_1_1_20500_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/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0x45b4d3863f468568fc5eeac2844bdeb327379685c6eabe99b83f801ca7576f73",
-                    "mixHash" : "0xfb8f6e740e1b90016e41c221f9f62d675562b6ebd437b120a12bd486e96b2524",
-                    "nonce" : "0x2d561d1f1e6efa65",
+                    "hash" : "0xa325468ffb423ec63f26f3156d40b080e26dc1fa1f024eba125b02c69c3899d7",
+                    "mixHash" : "0x2b714b090ce97a05f87e108aea3f99c1aafc231f1b19ad71f93a1a22bda987c3",
+                    "nonce" : "0xf8c8a3257d08dcde",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0fb8f6e740e1b90016e41c221f9f62d675562b6ebd437b120a12bd486e96b2524882d561d1f1e6efa65f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a02b714b090ce97a05f87e108aea3f99c1aafc231f1b19ad71f93a1a22bda987c388f8c8a3257d08dcdef90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45b4d3863f468568fc5eeac2844bdeb327379685c6eabe99b83f801ca7576f73",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa325468ffb423ec63f26f3156d40b080e26dc1fa1f024eba125b02c69c3899d7",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_1_1_1_20500_d0g0v0_Metropolis" : {
+    "modexp_1_1_1_20500_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/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0xf0d1a4088947b83df18ec597328344078e6f34bd2f825d96f03fb93f6e1bae44",
-                    "mixHash" : "0x4ecce649ff086ccb460bdb3e6fa6f5dfdfea88d1c0ed7d957f7175a8afcb629b",
-                    "nonce" : "0x934a176b8f4a67a5",
+                    "hash" : "0xde24b0ed7a3a494a81df472669ca16c521abedde2d597adb8cc444c9590c1979",
+                    "mixHash" : "0x3ddfb1e833de122e051ef452faf98896e32b6fb4a8b7d1a877b3ee4d16cf1162",
+                    "nonce" : "0x3f570ff5166ba0eb",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
-                    "stateRoot" : "0xb2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29c",
+                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
+                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29ca086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a04ecce649ff086ccb460bdb3e6fa6f5dfdfea88d1c0ed7d957f7175a8afcb629b88934a176b8f4a67a5f90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a03ddfb1e833de122e051ef452faf98896e32b6fb4a8b7d1a877b3ee4d16cf1162883f570ff5166ba0ebf90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0d1a4088947b83df18ec597328344078e6f34bd2f825d96f03fb93f6e1bae44",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xde24b0ed7a3a494a81df472669ca16c521abedde2d597adb8cc444c9590c1979",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aa1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76155e6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_1_1_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_1_1_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa82c",
+                    "hash" : "0x69ddb475911a09c3ae200c62efff7aaeac257568025c256604e68f4b10e8457c",
+                    "mixHash" : "0x39ac0cf7ed7dab463f3a3fce2c2b97108d05616274d24bc4d0963ca838a1b0e0",
+                    "nonce" : "0x33a88445653b1cdb",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
+                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x86d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a086d384eba47ddb17ca9549feff76a917e4a8231001d12228c43306c8c5f1624da02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a039ac0cf7ed7dab463f3a3fce2c2b97108d05616274d24bc4d0963ca838a1b0e08833a88445653b1cdbf90127f90124010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba08d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8a03d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa82c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8d7c03a300d1259fd22895adb720e9a139356e126bd5099b91d9c28851cac4c8",
+                        "s" : "0x3d40e258326ed32424d01c2b8d1297e6a93526fa9d0efd6ca744d8a608035ea0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x69ddb475911a09c3ae200c62efff7aaeac257568025c256604e68f4b10e8457c",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json
index 51ab3f09f..46cda6dc8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_1_1_22000_d0g0v0_EIP150" : {
+    "modexp_1_1_1_22000_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/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x7004a38c143d8f3aea7fc267f82e345f6bbf9ea339785f69f98b84a38a383969",
-                    "mixHash" : "0x9d60482390e56b072afe9d7b4157c06b8f88a054beb6fc28ffb0c238f270df4d",
-                    "nonce" : "0xe44b35e50659ac97",
+                    "hash" : "0x742d4ce6c603714e68a1e9b71ecbd08b4dd5d7a83e73dbbe4235af180c641e1d",
+                    "mixHash" : "0x896714fa267aeefbf224db06f6ce74023008d452d45d90e48b774e0a578d28e0",
+                    "nonce" : "0x649a7277a547587a",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a09d60482390e56b072afe9d7b4157c06b8f88a054beb6fc28ffb0c238f270df4d88e44b35e50659ac97f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0896714fa267aeefbf224db06f6ce74023008d452d45d90e48b774e0a578d28e088649a7277a547587af90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7004a38c143d8f3aea7fc267f82e345f6bbf9ea339785f69f98b84a38a383969",
-        "network" : "EIP150",
+        "lastblockhash" : "0x742d4ce6c603714e68a1e9b71ecbd08b4dd5d7a83e73dbbe4235af180c641e1d",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_1_1_22000_d0g0v0_EIP158" : {
+    "modexp_1_1_1_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xd6c596ad88687e8f63da9b6575aabb9ad249c5ae73563f60887ec71acf99bc67",
+                    "mixHash" : "0x89ce97bea2c587ce7d1dba35a4220d33031a48518cca525623339df9125719be",
+                    "nonce" : "0x8c9802e0a860e528",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a089ce97bea2c587ce7d1dba35a4220d33031a48518cca525623339df9125719be888c9802e0a860e528f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xae08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x93331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61",
+                        "s" : "0x04ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848be",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd6c596ad88687e8f63da9b6575aabb9ad249c5ae73563f60887ec71acf99bc67",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_1_1_22000_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/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x9e9256f76af31e6de23bdc9aaed01e8a6fe2f8ed99ce2417fb4471db17abb620",
-                    "mixHash" : "0xab6aeec3abc00706e5d8576cc2a23f9b62e399175b7553fa9293db5f2ef30350",
-                    "nonce" : "0x17c468a234b51ed0",
+                    "hash" : "0x42a023ca4746bd1a95558f4e74057ba66f97c3de263ef58bfe781f981337d5b8",
+                    "mixHash" : "0x00450654bc958943562b7fed8d5071eadead90ad6e8fa5af19003ccac9294af0",
+                    "nonce" : "0x01d0669120868886",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ab6aeec3abc00706e5d8576cc2a23f9b62e399175b7553fa9293db5f2ef303508817c468a234b51ed0f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a000450654bc958943562b7fed8d5071eadead90ad6e8fa5af19003ccac9294af08801d0669120868886f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e9256f76af31e6de23bdc9aaed01e8a6fe2f8ed99ce2417fb4471db17abb620",
-        "network" : "EIP158",
+        "lastblockhash" : "0x42a023ca4746bd1a95558f4e74057ba66f97c3de263ef58bfe781f981337d5b8",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_1_1_22000_d0g0v0_Frontier" : {
+    "modexp_1_1_1_22000_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/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae08",
-                    "hash" : "0x83b498d6674aaebeeb1bed14e640b844f4afb18d54df16c7cbd0e2db2e9ee4e8",
-                    "mixHash" : "0x1feab04bfc24d949726bc41b3f5000b45940c6b8ce1ff43f8bbf7304f8626711",
-                    "nonce" : "0x5a6d5caa5f21c5e8",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x09eb665abb1487771c0e94a52b4f26ffc0f4ac240a48feccb6c3fb1ee09c7371",
+                    "mixHash" : "0x64c0ced561bce36702ad68881b4878b01488315c7bc84df8806c28cd9a445d4d",
+                    "nonce" : "0xc19051d33892a6f0",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8",
-                    "stateRoot" : "0x0b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2e",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a01feab04bfc24d949726bc41b3f5000b45940c6b8ce1ff43f8bbf7304f8626711885a6d5caa5f21c5e8f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a064c0ced561bce36702ad68881b4878b01488315c7bc84df8806c28cd9a445d4d88c19051d33892a6f0f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83b498d6674aaebeeb1bed14e640b844f4afb18d54df16c7cbd0e2db2e9ee4e8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x09eb665abb1487771c0e94a52b4f26ffc0f4ac240a48feccb6c3fb1ee09c7371",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aff6",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761500a",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_1_1_22000_d0g0v0_Homestead" : {
+    "modexp_1_1_1_22000_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/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae08",
-                    "hash" : "0xc4c10764a9084b289a673c6b09532c904c00efa8e7903b3d08bc5673209c116b",
-                    "mixHash" : "0x81f96901fd82f939574b27fb92e358c05fcc7529cb88fb73eab8cae756e052a2",
-                    "nonce" : "0xfa2dfb26969f1af2",
+                    "hash" : "0x9affe67f5c670521496944b55a9e3abd42c3b382cdb081d5133882b9c93da1ec",
+                    "mixHash" : "0xb4f53ff7ba92a464de358cc83222b330dcd25f231bbaf7813418470996676d25",
+                    "nonce" : "0xc642b667f2c5cc0e",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a081f96901fd82f939574b27fb92e358c05fcc7529cb88fb73eab8cae756e052a288fa2dfb26969f1af2f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a0b4f53ff7ba92a464de358cc83222b330dcd25f231bbaf7813418470996676d2588c642b667f2c5cc0ef90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4c10764a9084b289a673c6b09532c904c00efa8e7903b3d08bc5673209c116b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9affe67f5c670521496944b55a9e3abd42c3b382cdb081d5133882b9c93da1ec",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_1_1_22000_d0g0v0_Metropolis" : {
+    "modexp_1_1_1_22000_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/stPreCompiledContracts/modexp_1_1_1_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x9be666834fdf4a2e53bc70c838a9903c6379439990b163567c9fc459bdce7cab",
-                    "mixHash" : "0x28d6635b569941309a1667b5e7f78534d468b44643713c168b817fdcc9e6e447",
-                    "nonce" : "0x68c6be6adae11f38",
+                    "gasUsed" : "0xae08",
+                    "hash" : "0xf9896799a14891795482d8bcd066e0a5a3be09c9ab40438e7ac10467f9576646",
+                    "mixHash" : "0x2b42a938bb88c7a974dde2848c8428c02043f9e476e8452d3ae0f5b38a13a9bf",
+                    "nonce" : "0xfc6b141cc00762eb",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "receiptTrie" : "0x023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8",
+                    "stateRoot" : "0x0b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x22885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a028d6635b569941309a1667b5e7f78534d468b44643713c168b817fdcc9e6e4478868c6be6adae11f38f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea022885f7ce584ecb279bf96149b7e6643d82383b5927dd96ac8e78c3713d7a42ea0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a02b42a938bb88c7a974dde2848c8428c02043f9e476e8452d3ae0f5b38a13a9bf88fc6b141cc00762ebf90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca093331c6ee29f0c75b9cd2c9d2f49227c57e58a852a7f21c41f18f26d78af6f61a004ad0ee36470118e533474b3b33f5b71486673fb8026c6d643df8ebfe06848bec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9be666834fdf4a2e53bc70c838a9903c6379439990b163567c9fc459bdce7cab",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf9896799a14891795482d8bcd066e0a5a3be09c9ab40438e7ac10467f9576646",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f6aff6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a761500a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json
index e12b0d1ca..dfdaff581 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_1_1_25000_d0g0v0_EIP150" : {
+    "modexp_1_1_1_25000_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/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x93e515037595c414544a03aa97c2bfe4f91064fac6c5d60ae755af07fed9e25c",
-                    "mixHash" : "0x57af3b2043478382dfad0e079879a8916835b5529e12b959c6239a19bc2c06c0",
-                    "nonce" : "0x944644307f8bc14e",
+                    "hash" : "0xd942547c4106a36b9b4a8e54b6e5bdb228afb5f4dd50aea3560895889aaec21d",
+                    "mixHash" : "0x494cd0047145241c57484c7bc81e487c6aaf2141e44c19836f4d52341aa8b44f",
+                    "nonce" : "0x8604c18dc84de9a0",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a057af3b2043478382dfad0e079879a8916835b5529e12b959c6239a19bc2c06c088944644307f8bc14ef90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0494cd0047145241c57484c7bc81e487c6aaf2141e44c19836f4d52341aa8b44f888604c18dc84de9a0f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93e515037595c414544a03aa97c2bfe4f91064fac6c5d60ae755af07fed9e25c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd942547c4106a36b9b4a8e54b6e5bdb228afb5f4dd50aea3560895889aaec21d",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_1_1_25000_d0g0v0_EIP158" : {
+    "modexp_1_1_1_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x31a0e4441df14c2b62f33000788ca5f8fc422e534816ab4c6f8ae22589084950",
+                    "mixHash" : "0x73178abb1f742b2e0141bee014dc76be735cd792fafe628c35236c551597a163",
+                    "nonce" : "0xbfea231c49cdf3ab",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a073178abb1f742b2e0141bee014dc76be735cd792fafe628c35236c551597a16388bfea231c49cdf3abf90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb9c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xb3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433",
+                        "s" : "0x74f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x31a0e4441df14c2b62f33000788ca5f8fc422e534816ab4c6f8ae22589084950",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_1_1_25000_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/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xc512f0179e5de81a99f76efb03f6a4a29e800df5f33678a56895855774299856",
-                    "mixHash" : "0x7924c7bc755d6a999612cde86998aeac951e05651222437ab414efc7925af062",
-                    "nonce" : "0x625af65a02005631",
+                    "hash" : "0x31e9e2df28356641d5961478a41487d1439a163e80c4ad6e728800f3acb85fe8",
+                    "mixHash" : "0x0555b57afaaa6e99f3417a52ca1f7300d3bf00c7a141c466667a88c058b0cb22",
+                    "nonce" : "0xa215b7fc12f061e0",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a07924c7bc755d6a999612cde86998aeac951e05651222437ab414efc7925af06288625af65a02005631f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a00555b57afaaa6e99f3417a52ca1f7300d3bf00c7a141c466667a88c058b0cb2288a215b7fc12f061e0f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc512f0179e5de81a99f76efb03f6a4a29e800df5f33678a56895855774299856",
-        "network" : "EIP158",
+        "lastblockhash" : "0x31e9e2df28356641d5961478a41487d1439a163e80c4ad6e728800f3acb85fe8",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_1_1_25000_d0g0v0_Frontier" : {
+    "modexp_1_1_1_25000_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/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb9c0",
-                    "hash" : "0xccd0b89e35e6e36f9c41d72d49ab68520f30be37a8d48798e5d0f1114a147b13",
-                    "mixHash" : "0x0db10f7ca3a9a65c30fd0509b276e17e293f830ca7774f95f3068619fd73abcd",
-                    "nonce" : "0x487fc74cb3c228a8",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x51b37f281e17c29488ffd17d8116f501088372ff531027cfa6a4171b00367cce",
+                    "mixHash" : "0x5b3a3b5d51398e67d81e6e7b223324c69b12fd8ec2adb4f49b10ee03f602a5e3",
+                    "nonce" : "0x4852295c39114992",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x6a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1a",
-                    "stateRoot" : "0x81eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a00db10f7ca3a9a65c30fd0509b276e17e293f830ca7774f95f3068619fd73abcd88487fc74cb3c228a8f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a05b3a3b5d51398e67d81e6e7b223324c69b12fd8ec2adb4f49b10ee03f602a5e3884852295c39114992f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xccd0b89e35e6e36f9c41d72d49ab68520f30be37a8d48798e5d0f1114a147b13",
-        "network" : "Frontier",
+        "lastblockhash" : "0x51b37f281e17c29488ffd17d8116f501088372ff531027cfa6a4171b00367cce",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bbae",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614452",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_1_1_25000_d0g0v0_Homestead" : {
+    "modexp_1_1_1_25000_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/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb9c0",
-                    "hash" : "0x7a8a309270c685aae13c3d889456d5e5773c285ab985760662e6aa4fdb2fcfb7",
-                    "mixHash" : "0x95621184202a0b8193c7dbadcdf47cea85004add9e2d730f2015910753932c7e",
-                    "nonce" : "0x94100472a34f1c98",
+                    "hash" : "0xf2b87ae5af56cedc2123d602099c074a7e5f0cc50d5b55747177662f60cd9553",
+                    "mixHash" : "0x195940c4130b389e369fd92c3c7a312249cfdc598e5bba75103b519ebb702a4d",
+                    "nonce" : "0xebf65d71c2ab81ca",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x6a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1a",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a095621184202a0b8193c7dbadcdf47cea85004add9e2d730f2015910753932c7e8894100472a34f1c98f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a0195940c4130b389e369fd92c3c7a312249cfdc598e5bba75103b519ebb702a4d88ebf65d71c2ab81caf90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a8a309270c685aae13c3d889456d5e5773c285ab985760662e6aa4fdb2fcfb7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf2b87ae5af56cedc2123d602099c074a7e5f0cc50d5b55747177662f60cd9553",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_1_1_25000_d0g0v0_Metropolis" : {
+    "modexp_1_1_1_25000_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/stPreCompiledContracts/modexp_1_1_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x65ddb3e13e4b802a49a85db0b87562bd44caa31263c4eb42f34e7d030bcfa14b",
-                    "mixHash" : "0xad6d738c46b0719f418bec8bfa99eb2b873e2cfaa04c938e8d82c99a85cb4f25",
-                    "nonce" : "0x63f73f81e472ae1a",
+                    "gasUsed" : "0xb9c0",
+                    "hash" : "0x203d68975c4bbd27451e62df4bf9339a5a03849001c0c55cbe01ee4c7beed071",
+                    "mixHash" : "0x321dc9410ceb3e0bf7c1b05e5c6f6312d0fff513c8e4a9cb72d3dcd988117bf3",
+                    "nonce" : "0xe8e9c8a06198c342",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "receiptTrie" : "0x6a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1a",
+                    "stateRoot" : "0x81eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ad6d738c46b0719f418bec8bfa99eb2b873e2cfaa04c938e8d82c99a85cb4f258863f73f81e472ae1af90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a09a7cdaff1c61237e0eb305cb60a2003174991559407305012df844acbcfc356ea06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a0321dc9410ceb3e0bf7c1b05e5c6f6312d0fff513c8e4a9cb72d3dcd988117bf388e8e9c8a06198c342f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ba0b3914b33a36fe44c138d04428f048ecf9c237a59a684a654386c6cc57a891433a074f705c8c2b5c0d7c09080bc3d7b1678d260ec9b436e614407268d23b8b5790ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65ddb3e13e4b802a49a85db0b87562bd44caa31263c4eb42f34e7d030bcfa14b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x203d68975c4bbd27451e62df4bf9339a5a03849001c0c55cbe01ee4c7beed071",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f6bbae",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a7614452",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json
index e9468390e..248f8d4e7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_1_1_1_35000_d0g0v0_EIP150" : {
+    "modexp_1_1_1_35000_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/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x78dbfa423cc1e791c424fbbc3a5c36d7572ff9d6ff542ea6984f87907e179f6b",
-                    "mixHash" : "0x3c6dd74cbfc3feeb04b3f2808138a1a4e608ca66b3f2fad91a68d610eafe978c",
-                    "nonce" : "0x977d725212ef0add",
+                    "hash" : "0xe75a2e250e3cc13e563616067024cd29657aae93ff352b4a28bd35602393061c",
+                    "mixHash" : "0x15727235caa3e75f97d8f5f379c15555477a2fdce240c0d4b2d279d290403845",
+                    "nonce" : "0x1433ae98c872d212",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a03c6dd74cbfc3feeb04b3f2808138a1a4e608ca66b3f2fad91a68d610eafe978c88977d725212ef0addf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a015727235caa3e75f97d8f5f379c15555477a2fdce240c0d4b2d279d290403845881433ae98c872d212f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78dbfa423cc1e791c424fbbc3a5c36d7572ff9d6ff542ea6984f87907e179f6b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe75a2e250e3cc13e563616067024cd29657aae93ff352b4a28bd35602393061c",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_1_1_1_35000_d0g0v0_EIP158" : {
+    "modexp_1_1_1_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x9d94eb03c01a6b603e5bb6238da41dcb2ed19a9acd3f6602608506ce1076215f",
+                    "mixHash" : "0xe19dec12ebaf5f36bcb8920778c393822bf3b3647dcaa260cef4d161c80f00ad",
+                    "nonce" : "0x54e17829dad5976c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0e19dec12ebaf5f36bcb8920778c393822bf3b3647dcaa260cef4d161c80f00ad8854e17829dad5976cf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe0d0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156d",
+                        "s" : "0x45875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d94eb03c01a6b603e5bb6238da41dcb2ed19a9acd3f6602608506ce1076215f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_1_1_1_35000_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/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xcf8f2702e569b31b7d3c59d3c2d1f413dfa5934ebc8833a395d6b55fef00bc0b",
-                    "mixHash" : "0xeba34e0c365b6493f27531f4672b8613bbba54845482790d5e2be8e702d11998",
-                    "nonce" : "0x06f9439de7d6c8ca",
+                    "hash" : "0x123a8db6efd281f2fd88559b9b5020b890fa53d4e0201b340947a98309652ef7",
+                    "mixHash" : "0xcb18acb05077cf81e8a7ae5848876409e1b4f0821d445e29c35ca49985b6b1c0",
+                    "nonce" : "0x289374fb0d3a13e8",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0eba34e0c365b6493f27531f4672b8613bbba54845482790d5e2be8e702d119988806f9439de7d6c8caf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0cb18acb05077cf81e8a7ae5848876409e1b4f0821d445e29c35ca49985b6b1c088289374fb0d3a13e8f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf8f2702e569b31b7d3c59d3c2d1f413dfa5934ebc8833a395d6b55fef00bc0b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x123a8db6efd281f2fd88559b9b5020b890fa53d4e0201b340947a98309652ef7",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_1_1_1_35000_d0g0v0_Frontier" : {
+    "modexp_1_1_1_35000_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/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe0d0",
-                    "hash" : "0x935057e1e2641db0542470eabf99fd49b9f41ada6d4b48bf45d289175d1d71d0",
-                    "mixHash" : "0x790bfa560a03a81993bd09b8ec17e75390ce7f9e4e3316bc7ac80dca8f2a7132",
-                    "nonce" : "0x6da31d212a53dcad",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x69940d197d70ec6dc65f9e4e103ae3ac34ead4e016d341aff80ce68029a62cb1",
+                    "mixHash" : "0xfbf30b0ba77a4ec33abd1a8ea507e4310445acf55a40b4eaf4b4e14fddb9b3bb",
+                    "nonce" : "0x753383c8cde5a41d",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xd963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93",
-                    "stateRoot" : "0xecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629b",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a0790bfa560a03a81993bd09b8ec17e75390ce7f9e4e3316bc7ac80dca8f2a7132886da31d212a53dcadf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0fbf30b0ba77a4ec33abd1a8ea507e4310445acf55a40b4eaf4b4e14fddb9b3bb88753383c8cde5a41df90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x935057e1e2641db0542470eabf99fd49b9f41ada6d4b48bf45d289175d1d71d0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x69940d197d70ec6dc65f9e4e103ae3ac34ead4e016d341aff80ce68029a62cb1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e2be",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611d42",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_1_1_1_35000_d0g0v0_Homestead" : {
+    "modexp_1_1_1_35000_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/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe0d0",
-                    "hash" : "0x57b45dcc2164597b5dcb6e450ca633410c721b0f34f649bad1ac9d53163718b4",
-                    "mixHash" : "0xa5068e08aa02d4e50045add26659131fd2049eccfe00c5186fb3d09def024df4",
-                    "nonce" : "0x413382bb2653b5b8",
+                    "hash" : "0xf34b453d6765265c5d18ca19f71eea3ddd18e5299b33212f27c9c61d552350ba",
+                    "mixHash" : "0xd6aede3b50faf1a433ecfe1ea0371fe7d148b34f6203141b26731fea7797f6a6",
+                    "nonce" : "0x5a56cf18c0221d46",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xd963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a0a5068e08aa02d4e50045add26659131fd2049eccfe00c5186fb3d09def024df488413382bb2653b5b8f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a0d6aede3b50faf1a433ecfe1ea0371fe7d148b34f6203141b26731fea7797f6a6885a56cf18c0221d46f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57b45dcc2164597b5dcb6e450ca633410c721b0f34f649bad1ac9d53163718b4",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf34b453d6765265c5d18ca19f71eea3ddd18e5299b33212f27c9c61d552350ba",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_1_1_1_35000_d0g0v0_Metropolis" : {
+    "modexp_1_1_1_35000_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/stPreCompiledContracts/modexp_1_1_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0xc6be6747eaf4ac087ce5280556928efda02c1d3afe48f84c6c4da9ca9637331d",
-                    "mixHash" : "0xafdf6034d14a42a1f87d41790df6880c61a7de2484f913e2681894edd0d23370",
-                    "nonce" : "0xb310586959a8f12b",
+                    "gasUsed" : "0xe0d0",
+                    "hash" : "0xe74a5e553714c1cead3e46bb3c52872ac5ecc06e662c41f02d009967214b3432",
+                    "mixHash" : "0x88c5adcaecb956cfc93fb9b24789b4227e56c3f496c4cacca0c0e3eb7e2e9282",
+                    "nonce" : "0x7d9249cc836db31a",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x3ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949",
+                    "receiptTrie" : "0xd963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93",
+                    "stateRoot" : "0xecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03ae6dd779be22f51651c681780cb43e5b28feede8c392a7b260668ca56926949a0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0afdf6034d14a42a1f87d41790df6880c61a7de2484f913e2681894edd0d2337088b310586959a8f12bf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0118ffedc73e90611b3bd7333671a0f4499ba6f082ba1fd8e80f581873b693cf1a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a088c5adcaecb956cfc93fb9b24789b4227e56c3f496c4cacca0c0e3eb7e2e9282887d9249cc836db31af90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000001ca0522b9eb12dc75e169ecd45648e1f2da909412462818648fbc3e8c86e8b20156da045875990c24698fe81636d20146059f58da4cdd79ab1acf5871a6f3ed633bd5cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6be6747eaf4ac087ce5280556928efda02c1d3afe48f84c6c4da9ca9637331d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe74a5e553714c1cead3e46bb3c52872ac5ecc06e662c41f02d009967214b3432",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f6e2be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a7611d42",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json
index 83dcf6744..3453d4a56 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_22411_22000_d0g0v0_EIP150" : {
+    "modexp_37120_22411_22000_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/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x792bc7f8031a2ba81520b7a3ec7db4e286ee3cafe0ace220a4de9a350c932c44",
-                    "mixHash" : "0x16bc66a9fa0a10d65e0e200396e7e514dfd94476373d0c1afc1fb2b50a7d34ac",
-                    "nonce" : "0x729ca6b33b74dee2",
+                    "gasUsed" : "0xf1c8",
+                    "hash" : "0xe4696958934645120fc1693b636c7d8ca8519124bd7e502a311ea529a396886c",
+                    "mixHash" : "0xb52a33807f929b60037335881e39071a9d8b17fbc4764cc44486d18bbbc89dec",
+                    "nonce" : "0x4af3cbefdbcb8b7f",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
+                    "stateRoot" : "0x46bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a016bc66a9fa0a10d65e0e200396e7e514dfd94476373d0c1afc1fb2b50a7d34ac88729ca6b33b74dee2f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0b52a33807f929b60037335881e39071a9d8b17fbc4764cc44486d18bbbc89dec884af3cbefdbcb8b7ff90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x792bc7f8031a2ba81520b7a3ec7db4e286ee3cafe0ace220a4de9a350c932c44",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe4696958934645120fc1693b636c7d8ca8519124bd7e502a311ea529a396886c",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f6f4c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a7610b3e",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_22411_22000_d0g0v0_EIP158" : {
+    "modexp_37120_22411_22000_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/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf1c8",
+                    "hash" : "0xad2f5e4a93b1e9e23ac0e01ca848d9bf243b3fdf1ec9857f2ea5a35252f56557",
+                    "mixHash" : "0x93dcd90e94cb69fab9e62acaaec64bf31f27d905e9151469eeec704e9780ad71",
+                    "nonce" : "0x52a83536d40d7451",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
+                    "stateRoot" : "0x46bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a093dcd90e94cb69fab9e62acaaec64bf31f27d905e9151469eeec704e9780ad718852a83536d40d7451f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xf1c8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x59a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855",
+                        "s" : "0x2a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fd",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xad2f5e4a93b1e9e23ac0e01ca848d9bf243b3fdf1ec9857f2ea5a35252f56557",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6f4c2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7610b3e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_22411_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x6500a9adc3dfdb52b95c32bb6e686602a08f2516d0ed05e35b580c01a9d0bec7",
-                    "mixHash" : "0x3564cc6e622611d2819523a84d93ccaad152649debba2510a24a9bac204e8535",
-                    "nonce" : "0x6dd3fdb4ce69cfd2",
+                    "hash" : "0x8f1c3d66c31ba362df7e52b68b3a15427ad5c18da0d804ee8a1fdf1b8f981384",
+                    "mixHash" : "0x0d2230ca33ab2b0ad843179497d7f2f6bb1821c2a6f83839d8b5c80945933755",
+                    "nonce" : "0x8ec90ef9b5739c5b",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a03564cc6e622611d2819523a84d93ccaad152649debba2510a24a9bac204e8535886dd3fdb4ce69cfd2f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a00d2230ca33ab2b0ad843179497d7f2f6bb1821c2a6f83839d8b5c80945933755888ec90ef9b5739c5bf90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6500a9adc3dfdb52b95c32bb6e686602a08f2516d0ed05e35b580c01a9d0bec7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8f1c3d66c31ba362df7e52b68b3a15427ad5c18da0d804ee8a1fdf1b8f981384",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_22411_22000_d0g0v0_Frontier" : {
+    "modexp_37120_22411_22000_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/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1c8",
-                    "hash" : "0x771b9064e6af4e8f6756419ff16363bc04477d169b667b10761bc91058f80031",
-                    "mixHash" : "0x71a630077b4a22691af931588651d6903992d1c304ecb210938d4b8bd63c9d1a",
-                    "nonce" : "0x8e78f3909bcba2d0",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x288240440464e2e5420195ca002ac49d4790653521816dc86c0ce70be1332bd8",
+                    "mixHash" : "0xf56db50154fe4e466508b7ed547d588cc234276a840f2a024816a95bf160d7e5",
+                    "nonce" : "0xf2440df02d76e302",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x70048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1",
-                    "stateRoot" : "0xfcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a071a630077b4a22691af931588651d6903992d1c304ecb210938d4b8bd63c9d1a888e78f3909bcba2d0f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0f56db50154fe4e466508b7ed547d588cc234276a840f2a024816a95bf160d7e588f2440df02d76e302f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x771b9064e6af4e8f6756419ff16363bc04477d169b667b10761bc91058f80031",
-        "network" : "Frontier",
+        "lastblockhash" : "0x288240440464e2e5420195ca002ac49d4790653521816dc86c0ce70be1332bd8",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4c2",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b3e",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_22411_22000_d0g0v0_Homestead" : {
+    "modexp_37120_22411_22000_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/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0xaa6aa38ad168915eacf61c17b0f30f244ab6a1feda2a573b6e9a6571590a24d4",
-                    "mixHash" : "0xd89eaecd96b39e12aecdaade64a83c7d4897f394def8fd82d9ec3690233d4032",
-                    "nonce" : "0xe447b99916eb1450",
+                    "hash" : "0xc0c5961d603657f45edf666337b2130500333428948cff0fba3fceb5888e271f",
+                    "mixHash" : "0x2bd91558e65eefae4ce2e40ce9c052283115c93953614ed212858108c27cc7d0",
+                    "nonce" : "0x5c96fbab6856e370",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x70048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0d89eaecd96b39e12aecdaade64a83c7d4897f394def8fd82d9ec3690233d403288e447b99916eb1450f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a02bd91558e65eefae4ce2e40ce9c052283115c93953614ed212858108c27cc7d0885c96fbab6856e370f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa6aa38ad168915eacf61c17b0f30f244ab6a1feda2a573b6e9a6571590a24d4",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc0c5961d603657f45edf666337b2130500333428948cff0fba3fceb5888e271f",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_22411_22000_d0g0v0_Metropolis" : {
+    "modexp_37120_22411_22000_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/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0xd810742403c4ee0f4433eeaf4b5a93c23f42e5b6db333f1d8fa541c1322aba9e",
-                    "mixHash" : "0x396c3b726f0ba68e8b356c1adeb2915cca59a4e350bfc43444c6f972840b1665",
-                    "nonce" : "0xa4f56b321559c71b",
+                    "hash" : "0x3afc65898b70d4c49cd3536a302c8da697686ac7d3bd204a7ccaa3bb5eb44bf7",
+                    "mixHash" : "0xded16f0ed5f73200da2c4e80c0d2943af827eefd23e215f76ee313b8a1730883",
+                    "nonce" : "0xb23e2bd465218922",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
-                    "stateRoot" : "0x46bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17",
+                    "receiptTrie" : "0x70048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1",
+                    "stateRoot" : "0xfcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0396c3b726f0ba68e8b356c1adeb2915cca59a4e350bfc43444c6f972840b166588a4f56b321559c71bf90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a0ac3752900fd9900cdf806d55ca70bae56d7b9068724be5d48ff9aa33f49e33b9a070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0ded16f0ed5f73200da2c4e80c0d2943af827eefd23e215f76ee313b8a173088388b23e2bd465218922f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba059a2a7823af3045ca3816fab7d2ccfb3dacd65a48f9c6488e21c096261301855a02a4c516bcffcd1dcebe9d9766edb5980f1ff7657cc2be3689d514c4280d315fdc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd810742403c4ee0f4433eeaf4b5a93c23f42e5b6db333f1d8fa541c1322aba9e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3afc65898b70d4c49cd3536a302c8da697686ac7d3bd204a7ccaa3bb5eb44bf7",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6f4c2",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json
index e99a6c9ad..d73ef27f1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_0_1000000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_0_1000000_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/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf07f",
-                    "hash" : "0x47c609ffd0ad4f57f99b2e8f9691825fd621feee732f119806c3b9921c420361",
-                    "mixHash" : "0x617281db86a3e3b7e6e7bcb1e8d7a4b5c6039acb3bc86dae02b6694f8cd98d04",
-                    "nonce" : "0x23a7e60a7792f1b2",
+                    "gasUsed" : "0x030474",
+                    "hash" : "0x300a55f9aa251f6600ad7b517aae81acdd5092b505aa9eceadf04dd10416a758",
+                    "mixHash" : "0xeb827179186aa19877f04a5f34e050cad9ca254038d72de5b7b9f7934eb79170",
+                    "nonce" : "0xc569e72be4437098",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
-                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
+                    "receiptTrie" : "0x1c2c9d670ad973221b888991fc6426380aa661183512fd7c9926aa60cf4482e1",
+                    "stateRoot" : "0x2cb7c6014317b5a6c6bf8b479c0f50ef7f4150f644aadea31987b11e3295149a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0617281db86a3e3b7e6e7bcb1e8d7a4b5c6039acb3bc86dae02b6694f8cd98d048823a7e60a7792f1b2f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02cb7c6014317b5a6c6bf8b479c0f50ef7f4150f644aadea31987b11e3295149aa056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a01c2c9d670ad973221b888991fc6426380aa661183512fd7c9926aa60cf4482e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830304748203e880a0eb827179186aa19877f04a5f34e050cad9ca254038d72de5b7b9f7934eb7917088c569e72be4437098f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47c609ffd0ad4f57f99b2e8f9691825fd621feee732f119806c3b9921c420361",
-        "network" : "EIP150",
+        "lastblockhash" : "0x300a55f9aa251f6600ad7b517aae81acdd5092b505aa9eceadf04dd10416a758",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f379",
+                "balance" : "0x4563918244f9076e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610c87",
+                "balance" : "0x0de0b6b3a75ef892",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_37120_37111_0_1000000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_0_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030474",
+                    "hash" : "0x9153bebb82a34b6f62a6215ce01a06892208ff726bd6ae04e8a6df4d73d0ec5a",
+                    "mixHash" : "0x9ab8fa15834a9a1d505f07ed1a7e1e9fb17257ab619bf2ab16266bcd0db96231",
+                    "nonce" : "0x7a5d109de0caceeb",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x1c2c9d670ad973221b888991fc6426380aa661183512fd7c9926aa60cf4482e1",
+                    "stateRoot" : "0x2cb7c6014317b5a6c6bf8b479c0f50ef7f4150f644aadea31987b11e3295149a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02cb7c6014317b5a6c6bf8b479c0f50ef7f4150f644aadea31987b11e3295149aa056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a01c2c9d670ad973221b888991fc6426380aa661183512fd7c9926aa60cf4482e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830304748203e880a09ab8fa15834a9a1d505f07ed1a7e1e9fb17257ab619bf2ab16266bcd0db96231887a5d109de0caceebf90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x0fdd18",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9",
+                        "s" : "0x4615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9153bebb82a34b6f62a6215ce01a06892208ff726bd6ae04e8a6df4d73d0ec5a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f9076e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75ef892",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_0_1000000_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/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf07f",
-                    "hash" : "0xe43577b6317ac8d95ce3ea5854326da71142cc405e5c05d3d839b0d0743a145b",
-                    "mixHash" : "0xe930cf466f900e00876a99391de3d7a58ec2b9f7a5a228e742910d5f5fcf4779",
-                    "nonce" : "0xb028938a41f6f219",
+                    "hash" : "0x34d6ec41ca28ab0660607c0b9959e0d1fb9ff83b5b5aed26c6cead9614f3fa91",
+                    "mixHash" : "0xe77b6c158ae53c8c117e0f73e40457ce111b8efb28dd52e5c510b3cebf0443fe",
+                    "nonce" : "0x1912bb5f51cc46d0",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0e930cf466f900e00876a99391de3d7a58ec2b9f7a5a228e742910d5f5fcf477988b028938a41f6f219f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0e77b6c158ae53c8c117e0f73e40457ce111b8efb28dd52e5c510b3cebf0443fe881912bb5f51cc46d0f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe43577b6317ac8d95ce3ea5854326da71142cc405e5c05d3d839b0d0743a145b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x34d6ec41ca28ab0660607c0b9959e0d1fb9ff83b5b5aed26c6cead9614f3fa91",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_1000000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_0_1000000_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/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0fdd18",
-                    "hash" : "0x45c5e72804fe7f156d796dcfb743cc8e5dd5ca81576f89df4bcd530c432b89f3",
-                    "mixHash" : "0x6955f78f21dc00508eee0f46c205b46b4a3971128b5d296f778adee12876621b",
-                    "nonce" : "0x6fee60a867bda5b2",
+                    "gasUsed" : "0xf07f",
+                    "hash" : "0xe21a9c31dece40b0d04b6ed2ca7640172e580d4296c936be2fea8fd2d79c6e35",
+                    "mixHash" : "0x22caf021cb7718adee1f6e25ab3f431fa8fdb4ba37881ec383ead94f663ad7b7",
+                    "nonce" : "0xb19d01a12d9e7d17",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x5c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0a",
-                    "stateRoot" : "0x5d42d9635cbbcbe1e21ede5254e2b0ab4dfa9e9d66fd87cb41f613bf41129471",
+                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
+                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05d42d9635cbbcbe1e21ede5254e2b0ab4dfa9e9d66fd87cb41f613bf41129471a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a05c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fdd188203e880a06955f78f21dc00508eee0f46c205b46b4a3971128b5d296f778adee12876621b886fee60a867bda5b2f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a022caf021cb7718adee1f6e25ab3f431fa8fdb4ba37881ec383ead94f663ad7b788b19d01a12d9e7d17f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45c5e72804fe7f156d796dcfb743cc8e5dd5ca81576f89df4bcd530c432b89f3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe21a9c31dece40b0d04b6ed2ca7640172e580d4296c936be2fea8fd2d79c6e35",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x456391824505e012",
+                "balance" : "0x4563918244f6f379",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7521fee",
+                "balance" : "0x0de0b6b3a7610c87",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_1000000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_0_1000000_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/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0fdd18",
-                    "hash" : "0x7392a3f8afbb6979d991ac180f5d94982ae84033982354e10e1722154e40f599",
-                    "mixHash" : "0x8da067af21f99eeaacb41ce499129ad9ac527b9c4f45c114353598d4c39de5af",
-                    "nonce" : "0xc44f11e3178128e2",
+                    "hash" : "0x8a7d6bb4fb5db98bd8d1bd46b5aa636b3a8694e878fccaf1e65c39fb12b9b389",
+                    "mixHash" : "0xb86472e24acc75cdb09dc15e9ee8231bd19f00a040f78387f3ef8479cf843a9e",
+                    "nonce" : "0x5682fbba4b98dfc2",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x5c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0a",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05d42d9635cbbcbe1e21ede5254e2b0ab4dfa9e9d66fd87cb41f613bf41129471a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a05c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fdd188203e880a08da067af21f99eeaacb41ce499129ad9ac527b9c4f45c114353598d4c39de5af88c44f11e3178128e2f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05d42d9635cbbcbe1e21ede5254e2b0ab4dfa9e9d66fd87cb41f613bf41129471a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a05c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fdd188203e880a0b86472e24acc75cdb09dc15e9ee8231bd19f00a040f78387f3ef8479cf843a9e885682fbba4b98dfc2f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7392a3f8afbb6979d991ac180f5d94982ae84033982354e10e1722154e40f599",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8a7d6bb4fb5db98bd8d1bd46b5aa636b3a8694e878fccaf1e65c39fb12b9b389",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_1000000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_0_1000000_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/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x030474",
-                    "hash" : "0xc4acf764038b13acba5c93920669ba61688bd2d1e763443c35ba5ab8d59f9cd2",
-                    "mixHash" : "0xae688237496b4326625a94ef1f6c8b7ee862f06088bd238696c409478d950f14",
-                    "nonce" : "0x998bc2212ad8502d",
+                    "gasUsed" : "0x0fdd18",
+                    "hash" : "0xc97548f2b1832c0f196c866cf5ec3e43692810c27d76c3c04b65c53aef782791",
+                    "mixHash" : "0x6fc63c1ef5d911c1c6d6c054f48deb753da2fbbedbdc0ad57123ded5279ab380",
+                    "nonce" : "0xc23a69157348b317",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x1c2c9d670ad973221b888991fc6426380aa661183512fd7c9926aa60cf4482e1",
-                    "stateRoot" : "0x2cb7c6014317b5a6c6bf8b479c0f50ef7f4150f644aadea31987b11e3295149a",
+                    "receiptTrie" : "0x5c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0a",
+                    "stateRoot" : "0x5d42d9635cbbcbe1e21ede5254e2b0ab4dfa9e9d66fd87cb41f613bf41129471",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02cb7c6014317b5a6c6bf8b479c0f50ef7f4150f644aadea31987b11e3295149aa056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a01c2c9d670ad973221b888991fc6426380aa661183512fd7c9926aa60cf4482e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830304748203e880a0ae688237496b4326625a94ef1f6c8b7ee862f06088bd238696c409478d950f1488998bc2212ad8502df90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05d42d9635cbbcbe1e21ede5254e2b0ab4dfa9e9d66fd87cb41f613bf41129471a056f1ede994a30763caaf1c9b49b0190ea8cdaf56b4f89207de80d5de45960f64a05c1f7871cf2002ae5eb123729dc8f18e64c0c2784ecb35c34e3465b9eb2e3e0ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fdd188203e880a06fc63c1ef5d911c1c6d6c054f48deb753da2fbbedbdc0ad57123ded5279ab38088c23a69157348b317f90209f902060101830fdd1894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0043c71ff3719f5d0602ae7eadfad2970040ba6efe698abd18e7d16337b1b64d9a04615feed7f83ecbdd53ec07d253e8fd21db8e293088afef26fca33d1b13b33d8c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4acf764038b13acba5c93920669ba61688bd2d1e763443c35ba5ab8d59f9cd2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc97548f2b1832c0f196c866cf5ec3e43692810c27d76c3c04b65c53aef782791",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f9076e",
+                "balance" : "0x456391824505e012",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75ef892",
+                "balance" : "0x0de0b6b3a7521fee",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json
index 150f5741a..68ec72ea9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_0_155000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_0_155000_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/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf07f",
-                    "hash" : "0xac5a965a888618556950b8c00b337366d695ef9d96d37cfef4f535667e1ed8e0",
-                    "mixHash" : "0x9b0705f134338762f512788669959e8fc7018171c3add60a4a670ec246694285",
-                    "nonce" : "0x32aa074d766ae9d6",
+                    "gasUsed" : "0x02f850",
+                    "hash" : "0xab646a1a09f75f94ff48c573c253a7e93cc98b85649717873f6bf3ceaf31484d",
+                    "mixHash" : "0x8e30a098accd8172cf3a26a403beda5bc94fa63459551db392a23ce3fe88f7e1",
+                    "nonce" : "0xd6c5100c3a12faf0",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
-                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
+                    "receiptTrie" : "0x22daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05",
+                    "stateRoot" : "0xfd2dd476afd61cf99199a5798c79649854b8da15d88d1ef1d7413be26528ca2b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a09b0705f134338762f512788669959e8fc7018171c3add60a4a670ec2466942858832aa074d766ae9d6f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fd2dd476afd61cf99199a5798c79649854b8da15d88d1ef1d7413be26528ca2ba066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a022daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a08e30a098accd8172cf3a26a403beda5bc94fa63459551db392a23ce3fe88f7e188d6c5100c3a12faf0f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac5a965a888618556950b8c00b337366d695ef9d96d37cfef4f535667e1ed8e0",
-        "network" : "EIP150",
+        "lastblockhash" : "0xab646a1a09f75f94ff48c573c253a7e93cc98b85649717873f6bf3ceaf31484d",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f379",
+                "balance" : "0x4563918244f8fb4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610c87",
+                "balance" : "0x0de0b6b3a75f04b6",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_0_155000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_0_155000_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/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x02f850",
+                    "hash" : "0x30acf0a53376f97abd6d7bdb27614832f20a5f24588fb90c4d3abc666a3e0efe",
+                    "mixHash" : "0xa4d8734c5d48c0ad28c021000ef5a06b05e141bfce12c11246a5921a10fe1781",
+                    "nonce" : "0x192e085f61be4568",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x22daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05",
+                    "stateRoot" : "0xfd2dd476afd61cf99199a5798c79649854b8da15d88d1ef1d7413be26528ca2b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fd2dd476afd61cf99199a5798c79649854b8da15d88d1ef1d7413be26528ca2ba066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a022daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0a4d8734c5d48c0ad28c021000ef5a06b05e141bfce12c11246a5921a10fe178188192e085f61be4568f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x02f850",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120",
+                        "s" : "0x0deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x30acf0a53376f97abd6d7bdb27614832f20a5f24588fb90c4d3abc666a3e0efe",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f8fb4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75f04b6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_0_155000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf07f",
-                    "hash" : "0xa6c6d923580e8f174301bb4e7d8155b184fc01dc658f5cdce4fdcd61b3be0467",
-                    "mixHash" : "0x8e2397a139eb7ff16e951d41a59c19499cf4a27f7e7148d2afc03169fd853465",
-                    "nonce" : "0xb69e3e9fd6da3274",
+                    "hash" : "0x9d59db964cd683f70a4f575bf55d61fe57531ace74a35966b23522619feb1325",
+                    "mixHash" : "0x0abdd4b5433fac9c3a87a6dc86bc51e7a0ed9a8101e354672c265db6d42ca5e3",
+                    "nonce" : "0xa4529d6af30a6f42",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a08e2397a139eb7ff16e951d41a59c19499cf4a27f7e7148d2afc03169fd85346588b69e3e9fd6da3274f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a00abdd4b5433fac9c3a87a6dc86bc51e7a0ed9a8101e354672c265db6d42ca5e388a4529d6af30a6f42f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6c6d923580e8f174301bb4e7d8155b184fc01dc658f5cdce4fdcd61b3be0467",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9d59db964cd683f70a4f575bf55d61fe57531ace74a35966b23522619feb1325",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_155000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_0_155000_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/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02f850",
-                    "hash" : "0x736b0c014f12f2d45e1d71d8cf38fe5fa922f0d27d6318a2db97f8caa03ca88d",
-                    "mixHash" : "0x361c35aa4908e8db4eb6317f39001dfd5bb922900a7c29b403d5dc6df250e737",
-                    "nonce" : "0x299bd35b3f514372",
+                    "gasUsed" : "0xf07f",
+                    "hash" : "0x183d23f421487577d12f7131f0256323ba8cba45bd1ef3e4d29bda70564acd3c",
+                    "mixHash" : "0xcf9092efd1388687331f20751ed6e58588b948e74cf65ecb250009a86019af4e",
+                    "nonce" : "0x481fe55c23a78b1c",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bd",
-                    "stateRoot" : "0x95d2d7561c9f3a4c4a7480c00bc1b2e38e4b1ff3cb587f7c80fd9320e226cfda",
+                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
+                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a095d2d7561c9f3a4c4a7480c00bc1b2e38e4b1ff3cb587f7c80fd9320e226cfdaa066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a0642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0361c35aa4908e8db4eb6317f39001dfd5bb922900a7c29b403d5dc6df250e73788299bd35b3f514372f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0cf9092efd1388687331f20751ed6e58588b948e74cf65ecb250009a86019af4e88481fe55c23a78b1cf90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x736b0c014f12f2d45e1d71d8cf38fe5fa922f0d27d6318a2db97f8caa03ca88d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x183d23f421487577d12f7131f0256323ba8cba45bd1ef3e4d29bda70564acd3c",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8fb4a",
+                "balance" : "0x4563918244f6f379",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f04b6",
+                "balance" : "0x0de0b6b3a7610c87",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_155000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_0_155000_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/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f850",
-                    "hash" : "0xdd2d9366cf383a3d3804c1305da5b0e6fe1286a1819789cc2794b72aef2adb8c",
-                    "mixHash" : "0xaf8dbe20580f567ab00407b90b6b125cb1913ce0dcafa9ac35ded3f9a0a1d862",
-                    "nonce" : "0xf30da9bb34a89f81",
+                    "hash" : "0xeea9d4682ddd0a3dba8c81225f0727abfef9f97dcf64459affe18a223f94344c",
+                    "mixHash" : "0x89b7aff7ef230c48f432654dd54f7dbcdafc42658d25aaa46d11fdbbb1d7f448",
+                    "nonce" : "0xd241a010e41b8dd2",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bd",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a095d2d7561c9f3a4c4a7480c00bc1b2e38e4b1ff3cb587f7c80fd9320e226cfdaa066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a0642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0af8dbe20580f567ab00407b90b6b125cb1913ce0dcafa9ac35ded3f9a0a1d86288f30da9bb34a89f81f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a095d2d7561c9f3a4c4a7480c00bc1b2e38e4b1ff3cb587f7c80fd9320e226cfdaa066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a0642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a089b7aff7ef230c48f432654dd54f7dbcdafc42658d25aaa46d11fdbbb1d7f44888d241a010e41b8dd2f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd2d9366cf383a3d3804c1305da5b0e6fe1286a1819789cc2794b72aef2adb8c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeea9d4682ddd0a3dba8c81225f0727abfef9f97dcf64459affe18a223f94344c",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_155000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_0_155000_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/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f850",
-                    "hash" : "0x10f5d53516fb2faee88e6ecd74095f67e19427d51eae99ed1719a69b3b5dec68",
-                    "mixHash" : "0x413cd8ae63e20073e64ed1c68a4d628f2b7c4e3ace45efcd0cfe31bc1148efbe",
-                    "nonce" : "0x5b65c0f03928be4e",
+                    "hash" : "0x67080e68a715b8cb9ddf2bc1efd0d221b8a21ade6b880957b7a8bcf24c459297",
+                    "mixHash" : "0x617e223fb780a72ce3e687d8e2cadea45493f9c225fcf5e67b54c6ba1ff87723",
+                    "nonce" : "0x0768ddb5694a82a1",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x22daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05",
-                    "stateRoot" : "0xfd2dd476afd61cf99199a5798c79649854b8da15d88d1ef1d7413be26528ca2b",
+                    "receiptTrie" : "0x642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bd",
+                    "stateRoot" : "0x95d2d7561c9f3a4c4a7480c00bc1b2e38e4b1ff3cb587f7c80fd9320e226cfda",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x66eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fd2dd476afd61cf99199a5798c79649854b8da15d88d1ef1d7413be26528ca2ba066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a022daa4ec618ff9864bc8ce0902c3f553084cec98cc8233f5fba9c0e52cf9bd05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0413cd8ae63e20073e64ed1c68a4d628f2b7c4e3ace45efcd0cfe31bc1148efbe885b65c0f03928be4ef90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a095d2d7561c9f3a4c4a7480c00bc1b2e38e4b1ff3cb587f7c80fd9320e226cfdaa066eb1e50d2f1346046043cc943e336e57b3ec87afc6cd3ee2628f0e5038b5e68a0642de048d28d6f14a90b4151cc4512dcb8b697634663b541f0e9d0dee374a9bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f8508203e880a0617e223fb780a72ce3e687d8e2cadea45493f9c225fcf5e67b54c6ba1ff87723880768ddb5694a82a1f90209f9020601018302f85094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca04597258a524aa3f7e153d08c89fb1d83259fb095cb1c79c76d71674ffc3ab120a00deaf6e96fd115c65b4230b49770579ea711e1dec54c388b566a7bcec0b68273c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10f5d53516fb2faee88e6ecd74095f67e19427d51eae99ed1719a69b3b5dec68",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x67080e68a715b8cb9ddf2bc1efd0d221b8a21ade6b880957b7a8bcf24c459297",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f8fb4a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json
index e29a11f03..d8a0a1b9e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_0_20500_d0g0v0_EIP150" : {
+    "modexp_37120_37111_0_20500_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/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xeaec",
-                    "hash" : "0x6dd5bf2449a099952e99e290f4bdd6c26b587a0fbfec5e7f5c97543cfe709d3c",
-                    "mixHash" : "0xa9a4f743a43103dd3aac12cd27cab073be7e11ade92635d0bcde1183111fa4d7",
-                    "nonce" : "0x4713755e50ba7e45",
+                    "hash" : "0x5ddeae354f17f75add50bc5abf3a58e9e97f18cf9479b6b252feef42c0d8cd38",
+                    "mixHash" : "0xd10dfbbb1cd023b0b0e2ac55c2e361c90e7ec60fb75b4b382c191874ce0fc049",
+                    "nonce" : "0x4d2eee881715c008",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135",
-                    "stateRoot" : "0x8ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942e",
+                    "receiptTrie" : "0xe9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645",
+                    "stateRoot" : "0xe7f96e411d575e5e75ef80ac9ae2e79535f9a102ea391974bc328befb10e2e5b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a0a9a4f743a43103dd3aac12cd27cab073be7e11ade92635d0bcde1183111fa4d7884713755e50ba7e45f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7f96e411d575e5e75ef80ac9ae2e79535f9a102ea391974bc328befb10e2e5ba06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0e9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a0d10dfbbb1cd023b0b0e2ac55c2e361c90e7ec60fb75b4b382c191874ce0fc049884d2eee881715c008f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6dd5bf2449a099952e99e290f4bdd6c26b587a0fbfec5e7f5c97543cfe709d3c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5ddeae354f17f75add50bc5abf3a58e9e97f18cf9479b6b252feef42c0d8cd38",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ede6",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_20500_d0g0v0_EIP158" : {
+    "modexp_37120_37111_0_20500_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/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xeaec",
-                    "hash" : "0x12ea4b6e824e11cc146990d8e7e443bb9231e6d531bc1a1b44a0a982dfb7be75",
-                    "mixHash" : "0xb3fc74a8f9c925b84a7a50e4d37e2f0ac876e7087559b859e42f750f452dadac",
-                    "nonce" : "0x388497f760ad92a9",
+                    "hash" : "0x6b0f884e273ea2eb3445c65c14fdab5d7756edef35ea2a36a36d2622beecf9e4",
+                    "mixHash" : "0x8b01ababdd37fec95e35bb4b0d08384023dde73f26ccc58a193902c38d63892d",
+                    "nonce" : "0x47db21f8cc2ccabb",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135",
-                    "stateRoot" : "0x8ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942e",
+                    "receiptTrie" : "0xe9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645",
+                    "stateRoot" : "0xe7f96e411d575e5e75ef80ac9ae2e79535f9a102ea391974bc328befb10e2e5b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a0b3fc74a8f9c925b84a7a50e4d37e2f0ac876e7087559b859e42f750f452dadac88388497f760ad92a9f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7f96e411d575e5e75ef80ac9ae2e79535f9a102ea391974bc328befb10e2e5ba06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0e9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a08b01ababdd37fec95e35bb4b0d08384023dde73f26ccc58a193902c38d63892d8847db21f8cc2ccabbf90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12ea4b6e824e11cc146990d8e7e443bb9231e6d531bc1a1b44a0a982dfb7be75",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6b0f884e273ea2eb3445c65c14fdab5d7756edef35ea2a36a36d2622beecf9e4",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ede6",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_20500_d0g0v0_Frontier" : {
+    "modexp_37120_37111_0_20500_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/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xeaec",
-                    "hash" : "0x85bf87a1348e1df4d88bb1b362ac95e66edfe052a8fc9c838b5d2d6217b62be3",
-                    "mixHash" : "0xd7513c4dabe818e4ef694a5c320b078560ddd4037fed9d5d9874dda1493b1d31",
-                    "nonce" : "0xb7c8ce1b522d3079",
+                    "hash" : "0x423d30f05db06f16c1efa518eda5afabe726f856fa109d0d98eedc6d571860e5",
+                    "mixHash" : "0x1b1ef90dc822c3795d2cc1bf943364601835b006cebc56207058d908219b105f",
+                    "nonce" : "0x4d4fbf9841b506e0",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a0d7513c4dabe818e4ef694a5c320b078560ddd4037fed9d5d9874dda1493b1d3188b7c8ce1b522d3079f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a01b1ef90dc822c3795d2cc1bf943364601835b006cebc56207058d908219b105f884d4fbf9841b506e0f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85bf87a1348e1df4d88bb1b362ac95e66edfe052a8fc9c838b5d2d6217b62be3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x423d30f05db06f16c1efa518eda5afabe726f856fa109d0d98eedc6d571860e5",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_20500_d0g0v0_Homestead" : {
+    "modexp_37120_37111_0_20500_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/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xeaec",
-                    "hash" : "0x227cc99df8519eafa0eb3610d61b02598b36e2b3fb659308080293439f9df525",
-                    "mixHash" : "0x76ac0267e383dde00a437e1fe3ab8326f5d7b35ce6bb31ac37ad24bab1305140",
-                    "nonce" : "0xfe3ab9c5093f5a92",
+                    "hash" : "0x87bde4042cf424bb7363225100834973d934872cba37d2ef9d5cfb62e82d9be8",
+                    "mixHash" : "0xefe7f1a86c6a82725fd29a6b9542dea918af2558825c60ccd8bf4d8a2264edb8",
+                    "nonce" : "0x17a78394e77e4826",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a076ac0267e383dde00a437e1fe3ab8326f5d7b35ce6bb31ac37ad24bab130514088fe3ab9c5093f5a92f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a0efe7f1a86c6a82725fd29a6b9542dea918af2558825c60ccd8bf4d8a2264edb88817a78394e77e4826f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x227cc99df8519eafa0eb3610d61b02598b36e2b3fb659308080293439f9df525",
-        "network" : "Homestead",
+        "lastblockhash" : "0x87bde4042cf424bb7363225100834973d934872cba37d2ef9d5cfb62e82d9be8",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_20500_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_0_20500_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/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xeaec",
-                    "hash" : "0x9229eb034905fe78d3d0256fe87b521a34c852419f652fc52aa291e958105c45",
-                    "mixHash" : "0x79c1e7a9f9e22d5e717e6a92873d5cba120658c323c4684876c8c4dadd86aea6",
-                    "nonce" : "0xfc1a4c13754c3729",
+                    "hash" : "0x03e97f14afac831419938f3ad8ed563611d84186943e536664881a33a9a8f8ce",
+                    "mixHash" : "0x1f709b88ecaac9f920923b46dc47b4305b5b32edc6b01059ed6b47900042a981",
+                    "nonce" : "0x72cbd8e8afd4f9d6",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0xe9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645",
-                    "stateRoot" : "0xe7f96e411d575e5e75ef80ac9ae2e79535f9a102ea391974bc328befb10e2e5b",
+                    "receiptTrie" : "0x309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135",
+                    "stateRoot" : "0x8ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e7f96e411d575e5e75ef80ac9ae2e79535f9a102ea391974bc328befb10e2e5ba06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0e9ca9d9ab4a96d3a27ed3547aba39e8de65e74ac39fad7fa811b675378364645b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a079c1e7a9f9e22d5e717e6a92873d5cba120658c323c4684876c8c4dadd86aea688fc1a4c13754c3729f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a01f709b88ecaac9f920923b46dc47b4305b5b32edc6b01059ed6b47900042a9818872cbd8e8afd4f9d6f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9229eb034905fe78d3d0256fe87b521a34c852419f652fc52aa291e958105c45",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x03e97f14afac831419938f3ad8ed563611d84186943e536664881a33a9a8f8ce",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ede6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761121a",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_0_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xeaec",
+                    "hash" : "0x8cb8ba81eb2e3b9f9db27532dab72fcfb73c66d8342af91c76a993a327d3857c",
+                    "mixHash" : "0x8902ec2802256bee6bd3a9b6e32561415c1b44dd448fd5901a8bd07db30385fb",
+                    "nonce" : "0x2a8d2a4bafadcbd4",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0x309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135",
+                    "stateRoot" : "0x8ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ac813c0733057d28cac1c0e1d2110ecd7ae8e36b1cef188270417976f9b942ea06e5e33bed45dc632cc00d5d1b8bf31d2d91e2b413cb9472432276deb7f5d95ada0309e42080b88d8d3c962dad38e2f83407bd51cdb2266bfc74fc6998264b7c135b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082eaec8203e880a08902ec2802256bee6bd3a9b6e32561415c1b44dd448fd5901a8bd07db30385fb882a8d2a4bafadcbd4f90208f90205010182eaec94c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca08b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932a05fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0xeaec",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x8b3b33d77e13dcee804813dd438df13b40d6c4422b7b1fe290fd17b63772e932",
+                        "s" : "0x5fece57ae7ce22b5a603ae4dda97c515ea0e66356e5ce3d3c2b40a1da674a823",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8cb8ba81eb2e3b9f9db27532dab72fcfb73c66d8342af91c76a993a327d3857c",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json
index 010449445..bc4fa92a7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_0_22000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_0_22000_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/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf07f",
-                    "hash" : "0x2bf6800f6d402753b7c59c0572d483ceadf8a6a2a07b1442c58273d30542a7f8",
-                    "mixHash" : "0xe3c836259d4a71bfc69f075714806ec0f25f5ef8d03d3237573933c336a7efe6",
-                    "nonce" : "0xf22131839c933849",
+                    "gasUsed" : "0xf0c8",
+                    "hash" : "0x664d25b698b2a594b2d34fc47492d0469f4a28dca634aad86cb925b442b01969",
+                    "mixHash" : "0xd7d7be5fae135b8660d2252d9ea38dcef94971a9096a806b78a368709bced96c",
+                    "nonce" : "0xb0f19c0004ee1809",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
-                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
+                    "receiptTrie" : "0xe85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141",
+                    "stateRoot" : "0x3adf665415694775846ecf2d6f3621b1c9ace058d2f136f1bb74aea41427aaac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0e3c836259d4a71bfc69f075714806ec0f25f5ef8d03d3237573933c336a7efe688f22131839c933849f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03adf665415694775846ecf2d6f3621b1c9ace058d2f136f1bb74aea41427aaaca0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a0e85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a0d7d7be5fae135b8660d2252d9ea38dcef94971a9096a806b78a368709bced96c88b0f19c0004ee1809f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bf6800f6d402753b7c59c0572d483ceadf8a6a2a07b1442c58273d30542a7f8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x664d25b698b2a594b2d34fc47492d0469f4a28dca634aad86cb925b442b01969",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f379",
+                "balance" : "0x4563918244f6f3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610c87",
+                "balance" : "0x0de0b6b3a7610c3e",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_0_22000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_0_22000_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/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf0c8",
+                    "hash" : "0x1f823eade5f3b7dfb6ad3a5b8aa02f549468eeb212b4065a3fa5bf886f167c62",
+                    "mixHash" : "0x7ece1572dbd2334d21ad4bddefc872a743c00f5119e03c6dc21a2b535baf67cc",
+                    "nonce" : "0xa73082b74335fb28",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xe85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141",
+                    "stateRoot" : "0x3adf665415694775846ecf2d6f3621b1c9ace058d2f136f1bb74aea41427aaac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03adf665415694775846ecf2d6f3621b1c9ace058d2f136f1bb74aea41427aaaca0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a0e85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a07ece1572dbd2334d21ad4bddefc872a743c00f5119e03c6dc21a2b535baf67cc88a73082b74335fb28f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0xf0c8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63",
+                        "s" : "0x20a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1f823eade5f3b7dfb6ad3a5b8aa02f549468eeb212b4065a3fa5bf886f167c62",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6f3c2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7610c3e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_0_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf07f",
-                    "hash" : "0x770a8b38a3b76e6d2a0abe450e2d2b0a045f1b00c042fa85b4bce321a3cad197",
-                    "mixHash" : "0x09b99f103e53d1bad0c3adc994115781aaf57d32210eea19df138ba5f3dfecf6",
-                    "nonce" : "0x64cde55339492d76",
+                    "hash" : "0xc026aca2338bbf157f27bab58104862714bcb2c456b752f952563319377b0e70",
+                    "mixHash" : "0xe6928dbc8a6a70732d99e7884b92ba2b4ed019798816f2fa1def34a9cc9a65fa",
+                    "nonce" : "0x2ab7eb3b92ef837d",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a009b99f103e53d1bad0c3adc994115781aaf57d32210eea19df138ba5f3dfecf68864cde55339492d76f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0e6928dbc8a6a70732d99e7884b92ba2b4ed019798816f2fa1def34a9cc9a65fa882ab7eb3b92ef837df90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x770a8b38a3b76e6d2a0abe450e2d2b0a045f1b00c042fa85b4bce321a3cad197",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc026aca2338bbf157f27bab58104862714bcb2c456b752f952563319377b0e70",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_22000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_0_22000_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/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf0c8",
-                    "hash" : "0x0a0a13040b37e4b603baf6211f9bc1f22a2ad3703d387e70d79d09d32ccfb7e5",
-                    "mixHash" : "0xb79e1e8f1bba91da37c0caa1e4173681c6af358272519253809f0f851e6d2a1c",
-                    "nonce" : "0x4b56cadd9714fd4e",
+                    "gasUsed" : "0xf07f",
+                    "hash" : "0xe74bf49414e7dcdc03115a3e481e34db49b1edf9eb5cfe7f23681eaa54175d6c",
+                    "mixHash" : "0x7dccc81d677d5e2d8191c6e4bd17da7e8208ae4c672463de6003a876f9a58b1a",
+                    "nonce" : "0x32857beb5e7f3437",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x13787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267",
-                    "stateRoot" : "0xd5d0dc1837433945e9982245378b12bfa36a64e14148e0455d9df8d2df404c4a",
+                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
+                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d5d0dc1837433945e9982245378b12bfa36a64e14148e0455d9df8d2df404c4aa0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a013787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a0b79e1e8f1bba91da37c0caa1e4173681c6af358272519253809f0f851e6d2a1c884b56cadd9714fd4ef90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a07dccc81d677d5e2d8191c6e4bd17da7e8208ae4c672463de6003a876f9a58b1a8832857beb5e7f3437f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a0a13040b37e4b603baf6211f9bc1f22a2ad3703d387e70d79d09d32ccfb7e5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe74bf49414e7dcdc03115a3e481e34db49b1edf9eb5cfe7f23681eaa54175d6c",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f3c2",
+                "balance" : "0x4563918244f6f379",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610c3e",
+                "balance" : "0x0de0b6b3a7610c87",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_22000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_0_22000_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/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf0c8",
-                    "hash" : "0x09042b81d4311ad9b152ca4bb6e5c409b280367f60fa089a8467d48ae186f8c6",
-                    "mixHash" : "0xceb724e439077d03fcd931952967204b276e1970d367215ec4e5d905154d8fe9",
-                    "nonce" : "0x6c240ce81b06ec98",
+                    "hash" : "0x2735929ec9b7cd48481f9a184346ea9663f59664b3cd9700c73051bcff76b943",
+                    "mixHash" : "0x9affe8d0b12318c5388d9f8d4f7d7bd433cc8173792ddaf59bd36b8d29aa4f3b",
+                    "nonce" : "0x4f2e1b4cd41d6ab6",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x13787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d5d0dc1837433945e9982245378b12bfa36a64e14148e0455d9df8d2df404c4aa0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a013787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a0ceb724e439077d03fcd931952967204b276e1970d367215ec4e5d905154d8fe9886c240ce81b06ec98f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d5d0dc1837433945e9982245378b12bfa36a64e14148e0455d9df8d2df404c4aa0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a013787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a09affe8d0b12318c5388d9f8d4f7d7bd433cc8173792ddaf59bd36b8d29aa4f3b884f2e1b4cd41d6ab6f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09042b81d4311ad9b152ca4bb6e5c409b280367f60fa089a8467d48ae186f8c6",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2735929ec9b7cd48481f9a184346ea9663f59664b3cd9700c73051bcff76b943",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_22000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_0_22000_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/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf0c8",
-                    "hash" : "0x42b55286544c547343847c789f6bf9307b4ee1725e472b68027c97a2c080f3ca",
-                    "mixHash" : "0x92519f9b3aee0154a3a4a63a49cd0482d0fd519069d3d298014c15c5b5d8b180",
-                    "nonce" : "0x6cf5b09db143f141",
+                    "hash" : "0x6daa2f3a099e7696ef19e07e2f6fcb4ceb917b64153f6b61ae0fcecf71b2a043",
+                    "mixHash" : "0x42ddc648a7d51e08b696b9dee5a41b809ab905cc9e7f47aa556bfc45b7e6fe24",
+                    "nonce" : "0x0e54cf131c2a85ef",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0xe85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141",
-                    "stateRoot" : "0x3adf665415694775846ecf2d6f3621b1c9ace058d2f136f1bb74aea41427aaac",
+                    "receiptTrie" : "0x13787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267",
+                    "stateRoot" : "0xd5d0dc1837433945e9982245378b12bfa36a64e14148e0455d9df8d2df404c4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03adf665415694775846ecf2d6f3621b1c9ace058d2f136f1bb74aea41427aaaca0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a0e85b100edfce258e1d30c911df1270d1a697d3013fa78cac93481858c4588141b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a092519f9b3aee0154a3a4a63a49cd0482d0fd519069d3d298014c15c5b5d8b180886cf5b09db143f141f90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
+                "rlp" : "0xf90406f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d5d0dc1837433945e9982245378b12bfa36a64e14148e0455d9df8d2df404c4aa0e2d0b190f83847fa107afd457499f3931452190d106faea79a555d2ceb52a457a013787937c7cca62e661a159ea88a68593a0118afeb62e0d368445753c7f76267b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f0c88203e880a042ddc648a7d51e08b696b9dee5a41b809ab905cc9e7f47aa556bfc45b7e6fe24880e54cf131c2a85eff90207f90204010182f0c894c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971c9f6b4b80d64d2bff140d080c60d3ed87cc69943ed59e8a08d65092fb668bea63a020a4b7964a7dad3ae5877fcbf122dcd3f13a4eb36ca4cbc013b997023a6eae99c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42b55286544c547343847c789f6bf9307b4ee1725e472b68027c97a2c080f3ca",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6daa2f3a099e7696ef19e07e2f6fcb4ceb917b64153f6b61ae0fcecf71b2a043",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6f3c2",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json
index bd4eacc86..3986d910b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_0_25000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_0_25000_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/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf07f",
-                    "hash" : "0x98d5b6160feb4362ed6971d27b45f914b77ea7f2f6cf3c3d84f1ed61e77987c2",
-                    "mixHash" : "0xce105bffe05c206380e902a4160c1d00aed6cca732c67605faa9ab9acb27f651",
-                    "nonce" : "0x414b4718742662e5",
+                    "gasUsed" : "0xfc80",
+                    "hash" : "0x745cd64119ba9c84fab217c563697e7ae015a20fbe493c561a3ce2fc87e29e8c",
+                    "mixHash" : "0xc1cf1f1eb1e4e3d577b70edd6db7bb36bb0aace7bb0b0fcbce06733e2e4b81f5",
+                    "nonce" : "0xf519d2fd7230109b",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
-                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
+                    "receiptTrie" : "0xc3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149",
+                    "stateRoot" : "0x03f4af91b8c35ba95be04d91389e3cbd767dd5215a4b7b3422c93f9cb605e00f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0ce105bffe05c206380e902a4160c1d00aed6cca732c67605faa9ab9acb27f65188414b4718742662e5f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a003f4af91b8c35ba95be04d91389e3cbd767dd5215a4b7b3422c93f9cb605e00fa0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a0c3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a0c1cf1f1eb1e4e3d577b70edd6db7bb36bb0aace7bb0b0fcbce06733e2e4b81f588f519d2fd7230109bf90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98d5b6160feb4362ed6971d27b45f914b77ea7f2f6cf3c3d84f1ed61e77987c2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x745cd64119ba9c84fab217c563697e7ae015a20fbe493c561a3ce2fc87e29e8c",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f379",
+                "balance" : "0x4563918244f6ff7a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610c87",
+                "balance" : "0x0de0b6b3a7610086",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_0_25000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_0_25000_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/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xfc80",
+                    "hash" : "0x1562d057b5971dd5dce547fe5a6d8e2aa619ac9da1d7dff47d9ec8588290264e",
+                    "mixHash" : "0xc403d8656092502bf38f98f41d44d3c062cf132c0ce002d5efbe396bf57974b2",
+                    "nonce" : "0x0e7e07f88a907f7c",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xc3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149",
+                    "stateRoot" : "0x03f4af91b8c35ba95be04d91389e3cbd767dd5215a4b7b3422c93f9cb605e00f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a003f4af91b8c35ba95be04d91389e3cbd767dd5215a4b7b3422c93f9cb605e00fa0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a0c3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a0c403d8656092502bf38f98f41d44d3c062cf132c0ce002d5efbe396bf57974b2880e7e07f88a907f7cf90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0xfc80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xaeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aea",
+                        "s" : "0x4ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1562d057b5971dd5dce547fe5a6d8e2aa619ac9da1d7dff47d9ec8588290264e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ff7a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7610086",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_0_25000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf07f",
-                    "hash" : "0xe53e119ca1086c570cb040b8e76c753f87150790e4c51173aba422e5a4dae787",
-                    "mixHash" : "0x797e4d13e951c12c810841bcf63509a8612228ed0ef5b5da5235adc3c030fd30",
-                    "nonce" : "0xb67f7bceacc88233",
+                    "hash" : "0x1da1d82e9e94b4cfcc3eaa4e6316b057f68748f2635cf0101fd021388b297c82",
+                    "mixHash" : "0x65892c2e32a80696464af51422472b3451d35c7694a3bd11bb2c0173b7ced6a2",
+                    "nonce" : "0x8e3cc561af21cea2",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0797e4d13e951c12c810841bcf63509a8612228ed0ef5b5da5235adc3c030fd3088b67f7bceacc88233f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a065892c2e32a80696464af51422472b3451d35c7694a3bd11bb2c0173b7ced6a2888e3cc561af21cea2f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe53e119ca1086c570cb040b8e76c753f87150790e4c51173aba422e5a4dae787",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1da1d82e9e94b4cfcc3eaa4e6316b057f68748f2635cf0101fd021388b297c82",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_25000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_0_25000_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/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xfc80",
-                    "hash" : "0xd96c4679060ec8bf73b1ce405a682559c836d42ba926be588eb855c90e831dbe",
-                    "mixHash" : "0x4bf88b45bc34ed0db9e68b3eba4ee2b0729a7246f8b4349907949f4f1a55bf15",
-                    "nonce" : "0x25984b2ff424c224",
+                    "gasUsed" : "0xf07f",
+                    "hash" : "0x50911640dfeb1fc2b8388670cab0bad674fd69765ba557c3ebee084b558e1772",
+                    "mixHash" : "0xb7e22e18a99fdf0a125ba338579349c6b4a7a398bbbded458f5156da6b815d3d",
+                    "nonce" : "0x2d92bd8c55b10bc4",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x4fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6d",
-                    "stateRoot" : "0x25470643434d9b972aa4ae91355fa58e9d791ef1d34d688c45329487781e7179",
+                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
+                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025470643434d9b972aa4ae91355fa58e9d791ef1d34d688c45329487781e7179a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a04fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a04bf88b45bc34ed0db9e68b3eba4ee2b0729a7246f8b4349907949f4f1a55bf158825984b2ff424c224f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0b7e22e18a99fdf0a125ba338579349c6b4a7a398bbbded458f5156da6b815d3d882d92bd8c55b10bc4f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd96c4679060ec8bf73b1ce405a682559c836d42ba926be588eb855c90e831dbe",
-        "network" : "Frontier",
+        "lastblockhash" : "0x50911640dfeb1fc2b8388670cab0bad674fd69765ba557c3ebee084b558e1772",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ff7a",
+                "balance" : "0x4563918244f6f379",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610086",
+                "balance" : "0x0de0b6b3a7610c87",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_25000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_0_25000_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/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfc80",
-                    "hash" : "0x1abd63d739bab6a84874fbccc5d7730454e82f5706e7d4a3dd9db0380918756d",
-                    "mixHash" : "0x1167c27e03c933b5147d5ea1bb10c2b2f8e27d6e39a8ff1b0670412ef2b7c83a",
-                    "nonce" : "0x23a255878d24df77",
+                    "hash" : "0xec65ff7795b0c6a0b053a48d27fce745ea6aa2119a43c76f8e91053b85392dcf",
+                    "mixHash" : "0x1e6e2447057efe5740264963daf91b7883e01030a31fb8e3a17d479d7c5f1d91",
+                    "nonce" : "0xb67f580603bfbd3f",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x4fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6d",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025470643434d9b972aa4ae91355fa58e9d791ef1d34d688c45329487781e7179a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a04fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a01167c27e03c933b5147d5ea1bb10c2b2f8e27d6e39a8ff1b0670412ef2b7c83a8823a255878d24df77f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025470643434d9b972aa4ae91355fa58e9d791ef1d34d688c45329487781e7179a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a04fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a01e6e2447057efe5740264963daf91b7883e01030a31fb8e3a17d479d7c5f1d9188b67f580603bfbd3ff90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1abd63d739bab6a84874fbccc5d7730454e82f5706e7d4a3dd9db0380918756d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xec65ff7795b0c6a0b053a48d27fce745ea6aa2119a43c76f8e91053b85392dcf",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_25000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_0_25000_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/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfc80",
-                    "hash" : "0x836eaa2f4ee566162dd5c38b5a45541f8475c8cff213744ff053a3b794ac64dc",
-                    "mixHash" : "0x4589bd98a913d1779bc58bd651800102ce889abe44bf26274608ef7e40ffac7c",
-                    "nonce" : "0x81c51e4c11d52b9d",
+                    "hash" : "0xfa3338ab5068700836f543f2a6c39bfd5ada56c772c22e5baf4cbd00f997f2ce",
+                    "mixHash" : "0xc65ed7d7c26b61b69fdf2e6dd52b44e34d0c5c3280afae6896de4b6747f96dab",
+                    "nonce" : "0x8bea02c69c910b18",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0xc3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149",
-                    "stateRoot" : "0x03f4af91b8c35ba95be04d91389e3cbd767dd5215a4b7b3422c93f9cb605e00f",
+                    "receiptTrie" : "0x4fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6d",
+                    "stateRoot" : "0x25470643434d9b972aa4ae91355fa58e9d791ef1d34d688c45329487781e7179",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a003f4af91b8c35ba95be04d91389e3cbd767dd5215a4b7b3422c93f9cb605e00fa0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a0c3d0ee8e00eda3cfad32dfa3158e348d8d099d4ddd233605da645fcd4dbe2149b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a04589bd98a913d1779bc58bd651800102ce889abe44bf26274608ef7e40ffac7c8881c51e4c11d52b9df90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
+                "rlp" : "0xf90407f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a025470643434d9b972aa4ae91355fa58e9d791ef1d34d688c45329487781e7179a0dd388e53c05995defd9dbe9f9444126ffe454322e6df4a5f43c383a29d6c3042a04fc4dee4758d42a09579239755056baaa89b9b480f5818e38cec852643bb7e6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fc808203e880a0c65ed7d7c26b61b69fdf2e6dd52b44e34d0c5c3280afae6896de4b6747f96dab888bea02c69c910b18f90208f90205010182fc8094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0aeb066b60eb9f01646578fe4d59ae488682b7adc4422f8aece55c5364a453aeaa04ca090ef0f2cc346d254ff3c48415f7951f703fc1c23edbba79a1e7d1b2b615ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x836eaa2f4ee566162dd5c38b5a45541f8475c8cff213744ff053a3b794ac64dc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfa3338ab5068700836f543f2a6c39bfd5ada56c772c22e5baf4cbd00f997f2ce",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ff7a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json
index 1535c6d25..456b3aba5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_0_35000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_0_35000_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/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf07f",
-                    "hash" : "0x296101abe20af05d0ce624846bd6263a9072aef6ba6745147a9884a30d305f0b",
-                    "mixHash" : "0x60a7ecd903edc4ac3a64bbbb680fefe31ef7126af1638053dfdd0cb0cf38aeaf",
-                    "nonce" : "0x0defb3cf59dfd647",
+                    "gasUsed" : "0x012390",
+                    "hash" : "0x9c3228f910afaeb1d98a398234522982644bc639c97a4f566fc6c675b005cae0",
+                    "mixHash" : "0x5f2ff0378881f5a45e708c422fdfb0698aa345e803fa570f8fb599dc9bfcaa5d",
+                    "nonce" : "0x3eba7365b0f4d61d",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
-                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
+                    "receiptTrie" : "0xd9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29",
+                    "stateRoot" : "0x47bf80927417573bb8da4f1319630ebd681cce22a6be1c5959adb416e239ff5c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a060a7ecd903edc4ac3a64bbbb680fefe31ef7126af1638053dfdd0cb0cf38aeaf880defb3cf59dfd647f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a047bf80927417573bb8da4f1319630ebd681cce22a6be1c5959adb416e239ff5ca0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0d9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a05f2ff0378881f5a45e708c422fdfb0698aa345e803fa570f8fb599dc9bfcaa5d883eba7365b0f4d61df90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x296101abe20af05d0ce624846bd6263a9072aef6ba6745147a9884a30d305f0b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9c3228f910afaeb1d98a398234522982644bc639c97a4f566fc6c675b005cae0",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f379",
+                "balance" : "0x4563918244f7268a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610c87",
+                "balance" : "0x0de0b6b3a760d976",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_0_35000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_0_35000_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/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x012390",
+                    "hash" : "0xee163752cde5b51a30ee1dc270bf7fec9e3162eca8b64b88d5d6bf5837fb57a7",
+                    "mixHash" : "0xc7836f91d07740339f91751223793edbf84bcea1d5d8b26e1dd631a8823f6d4e",
+                    "nonce" : "0xb2273421ca3af76f",
+                    "number" : "0x01",
+                    "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+                    "receiptTrie" : "0xd9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29",
+                    "stateRoot" : "0x47bf80927417573bb8da4f1319630ebd681cce22a6be1c5959adb416e239ff5c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a047bf80927417573bb8da4f1319630ebd681cce22a6be1c5959adb416e239ff5ca0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0d9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a0c7836f91d07740339f91751223793edbf84bcea1d5d8b26e1dd631a8823f6d4e88b2273421ca3af76ff90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x012390",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x34020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098",
+                        "s" : "0x07d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xee163752cde5b51a30ee1dc270bf7fec9e3162eca8b64b88d5d6bf5837fb57a7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7268a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760d976",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_0_35000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf07f",
-                    "hash" : "0x5126de79469d447f9db84d059edacd62ff3530166f425b41649497cbd9a2d612",
-                    "mixHash" : "0x7f33ecdbc5398486481b945c31376d5e422123d4a7c9881e2a23c4aa397f2c5a",
-                    "nonce" : "0x56ce4f8af6576338",
+                    "hash" : "0x4f10aaeeadeec36dfc8e690a6cad22f4ad5a7b7aa7fa5c5d07b86cefa1f05542",
+                    "mixHash" : "0xe821a0ca38f5cee7ce5fda1bae639d6178a61d8173f628e915db3181be7726ea",
+                    "nonce" : "0xb3202158a72cf770",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a07f33ecdbc5398486481b945c31376d5e422123d4a7c9881e2a23c4aa397f2c5a8856ce4f8af6576338f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0e821a0ca38f5cee7ce5fda1bae639d6178a61d8173f628e915db3181be7726ea88b3202158a72cf770f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5126de79469d447f9db84d059edacd62ff3530166f425b41649497cbd9a2d612",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4f10aaeeadeec36dfc8e690a6cad22f4ad5a7b7aa7fa5c5d07b86cefa1f05542",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_35000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_0_35000_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/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x012390",
-                    "hash" : "0xcb16f2dd11e2b4aaa41f4e53d2a00d2c0552d1dba0562ca4d7ab10f090d3b111",
-                    "mixHash" : "0x87d5deca352e958effac50d7485ef446bdd49069d75fa25d3ee7578176dc7415",
-                    "nonce" : "0xc368d52c23da09c0",
+                    "gasUsed" : "0xf07f",
+                    "hash" : "0x386fe935e4a2321230d30d9e4d6c0ae0fc65abd79f0bcfee12449c57e3cd140d",
+                    "mixHash" : "0xc88cd7ac611a62574d11207dbdce100c05bde50c6e5f45b9d7311f1b85c7bc12",
+                    "nonce" : "0x436dc87ac7c35c3f",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0xa79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039",
-                    "stateRoot" : "0x42f158e5b3a601125d53c7289655442544e1966bd6dc77ddc0488c920e0724b5",
+                    "receiptTrie" : "0x8074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95d",
+                    "stateRoot" : "0xa817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a042f158e5b3a601125d53c7289655442544e1966bd6dc77ddc0488c920e0724b5a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0a79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a087d5deca352e958effac50d7485ef446bdd49069d75fa25d3ee7578176dc741588c368d52c23da09c0f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "rlp" : "0xf90408f901f8a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a817a6bb74d4e46ebb4151af33ed7c0faa0a82ef449094ee2d7843cc277bd0a7a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa08074a4e0ca8b8c9ae0f3ae01750809024067289f6921ae43eee4b05a7089e95db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f07f8203e880a0c88cd7ac611a62574d11207dbdce100c05bde50c6e5f45b9d7311f1b85c7bc1288436dc87ac7c35c3ff90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb16f2dd11e2b4aaa41f4e53d2a00d2c0552d1dba0562ca4d7ab10f090d3b111",
-        "network" : "Frontier",
+        "lastblockhash" : "0x386fe935e4a2321230d30d9e4d6c0ae0fc65abd79f0bcfee12449c57e3cd140d",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7268a",
+                "balance" : "0x4563918244f6f379",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760d976",
+                "balance" : "0x0de0b6b3a7610c87",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_35000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_0_35000_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/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012390",
-                    "hash" : "0x4b941b22b4027c829ba3e5affdc90c173221e88a40fca9a0ba1e85c68472cf2a",
-                    "mixHash" : "0x7766a3166a333a6b4aa97bef0ed5d0af38a4dffac9af2ab1b0a602d8a9eab795",
-                    "nonce" : "0x168ff2646d7d0f20",
+                    "hash" : "0xdc5177bdc7bacbe3bf858db3a8f85b6a772861a5788fae0e3035f86de6ef7b45",
+                    "mixHash" : "0x2367ba9afd046cf349e2d8c42384cb4b060283b48160007b23d73651343daaca",
+                    "nonce" : "0x6b1893523dce3fa6",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
                     "receiptTrie" : "0xa79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a042f158e5b3a601125d53c7289655442544e1966bd6dc77ddc0488c920e0724b5a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0a79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a07766a3166a333a6b4aa97bef0ed5d0af38a4dffac9af2ab1b0a602d8a9eab79588168ff2646d7d0f20f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a042f158e5b3a601125d53c7289655442544e1966bd6dc77ddc0488c920e0724b5a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0a79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a02367ba9afd046cf349e2d8c42384cb4b060283b48160007b23d73651343daaca886b1893523dce3fa6f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b941b22b4027c829ba3e5affdc90c173221e88a40fca9a0ba1e85c68472cf2a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xdc5177bdc7bacbe3bf858db3a8f85b6a772861a5788fae0e3035f86de6ef7b45",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_0_35000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_0_35000_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/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012390",
-                    "hash" : "0x3e08a9dfacbed354102745b6638ea09971a00c208259a3b9f1b11614a82f89e4",
-                    "mixHash" : "0x02d69cefaeba52923102a6114f6656423c8c431e84a284612b8b6f30657bc820",
-                    "nonce" : "0x322e6a6babda5de0",
+                    "hash" : "0xc9fb9974ee16ea49e3b7baf057d151f21e9fcd8b1606add2075cf4df651a1593",
+                    "mixHash" : "0x5eb9e99f040ec709f0cd923df2c5897459433c9bf3907ce5e783b7adbfe4ddbf",
+                    "nonce" : "0x7a3c9f4c96296e83",
                     "number" : "0x01",
                     "parentHash" : "0xc829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268",
-                    "receiptTrie" : "0xd9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29",
-                    "stateRoot" : "0x47bf80927417573bb8da4f1319630ebd681cce22a6be1c5959adb416e239ff5c",
+                    "receiptTrie" : "0xa79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039",
+                    "stateRoot" : "0x42f158e5b3a601125d53c7289655442544e1966bd6dc77ddc0488c920e0724b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a047bf80927417573bb8da4f1319630ebd681cce22a6be1c5959adb416e239ff5ca0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0d9fa476cad77e03500652d7f1baee89bb384f256ecbdfc5b10b92317de37bb29b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a002d69cefaeba52923102a6114f6656423c8c431e84a284612b8b6f30657bc82088322e6a6babda5de0f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
+                "rlp" : "0xf90409f901f9a0c829be132b3daaf5126ed23f419a4415317f9ec9b441744c2206d5c93f81f268a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a042f158e5b3a601125d53c7289655442544e1966bd6dc77ddc0488c920e0724b5a0f6ffbe6ee8c25bc3a6c09c0459366038073a9c7b8ae58a8f601c751b65ccc35fa0a79e859b545b4b13274273b70a971093033ce302a8bd5fae08ea85fa60f2c039b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830123908203e880a05eb9e99f040ec709f0cd923df2c5897459433c9bf3907ce5e783b7adbfe4ddbf887a3c9f4c96296e83f90209f9020601018301239094c305c901078781c232a2a521c2af7980f8385ee980b901a430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca034020111229cefcbb75069095888213fce3de5a50f9e447372e992d369001098a007d03295a709abcaddc43352971c098c2e174ab9cf4181c71b3d389483827f72c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c9ed0758002ea9d70ce06bc16aac6d2c9f69fd9cb0996dcd73eecfcdc3c75eba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e08a9dfacbed354102745b6638ea09971a00c208259a3b9f1b11614a82f89e4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc9fb9974ee16ea49e3b7baf057d151f21e9fcd8b1606add2075cf4df651a1593",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7268a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json
index e2b30f8e3..dff481b92 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_1_1000000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_1_1000000_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/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x0e543fcd92e980f249aec63e0f195ff529a1cd9d5e33e2587b24ef8900dbf002",
-                    "mixHash" : "0x5fd51b15a7baac5129afcd91cfbdab5d964b0c30d0f993781bc12c748851de38",
-                    "nonce" : "0x899986445a9f285b",
+                    "gasUsed" : "0x030577",
+                    "hash" : "0x3bde5b760e5f9b8aec544bfbd2b918059a386d4a36c591d9fa07ceb7ff8d3379",
+                    "mixHash" : "0x19de49b9c00622d0a8dc19c0413af35a2cc5d051e30e56628e74f9d34ffd699d",
+                    "nonce" : "0x5128513e563623de",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0xce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6",
+                    "stateRoot" : "0x165e538a736ad96662636a845ebae19a9ef9aca2fe4a00b8d8a163370c0f103d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a05fd51b15a7baac5129afcd91cfbdab5d964b0c30d0f993781bc12c748851de3888899986445a9f285bf90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0165e538a736ad96662636a845ebae19a9ef9aca2fe4a00b8d8a163370c0f103da004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a0ce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305778203e880a019de49b9c00622d0a8dc19c0413af35a2cc5d051e30e56628e74f9d34ffd699d885128513e563623def90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e543fcd92e980f249aec63e0f195ff529a1cd9d5e33e2587b24ef8900dbf002",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3bde5b760e5f9b8aec544bfbd2b918059a386d4a36c591d9fa07ceb7ff8d3379",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f90871",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a75ef78f",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_37120_37111_1_1000000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_1_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030577",
+                    "hash" : "0xb5d2a74f67630536b4cdc9d8ebb9c9ed2820ed6e80a61a718699716b39c72f4f",
+                    "mixHash" : "0xed96c1600e42511a347894e9036ded1c1da7497bb0238ca56b5cabba6b3047ab",
+                    "nonce" : "0xdeaf87e8ae9c6054",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6",
+                    "stateRoot" : "0x165e538a736ad96662636a845ebae19a9ef9aca2fe4a00b8d8a163370c0f103d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0165e538a736ad96662636a845ebae19a9ef9aca2fe4a00b8d8a163370c0f103da004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a0ce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305778203e880a0ed96c1600e42511a347894e9036ded1c1da7497bb0238ca56b5cabba6b3047ab88deaf87e8ae9c6054f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0fde18",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdb",
+                        "s" : "0x0c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb5d2a74f67630536b4cdc9d8ebb9c9ed2820ed6e80a61a718699716b39c72f4f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f90871",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75ef78f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_1_1000000_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/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0xfecde060b6aea1d23ef7c8b58388b8c21dae8bc16580c26572273ca3c0258f8e",
-                    "mixHash" : "0xa856c60f1e056548068e7dfb2b1d4f14f8231a56e20c06d20cd1868cd2dfcebf",
-                    "nonce" : "0x54c2831f941aa5b0",
+                    "hash" : "0x360d13ff189782ec0d54c016afbec06a0ebf7bbedfee970679c5958e8e063326",
+                    "mixHash" : "0x0bb4b0ee644c18bd5de3812343c4f8efb3b15095b50dc29697996c78b28237fa",
+                    "nonce" : "0xcbef5d83f15b1994",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0a856c60f1e056548068e7dfb2b1d4f14f8231a56e20c06d20cd1868cd2dfcebf8854c2831f941aa5b0f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a00bb4b0ee644c18bd5de3812343c4f8efb3b15095b50dc29697996c78b28237fa88cbef5d83f15b1994f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfecde060b6aea1d23ef7c8b58388b8c21dae8bc16580c26572273ca3c0258f8e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x360d13ff189782ec0d54c016afbec06a0ebf7bbedfee970679c5958e8e063326",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_1000000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_1_1000000_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/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0fde18",
-                    "hash" : "0x433c184189f0e22498eace9cc9445791bd2fb4f03e67bacaf16c35af602881fc",
-                    "mixHash" : "0xd0ba27dfac8a1720dda5ce64b0ca4764efac5ca26cc08971e0bf57db55a2aa44",
-                    "nonce" : "0x21b52c4382d3c086",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0xdf7b8a2f92187483f2fadbe575a792fe7e323ae6ac7248714b95e60d7abc5085",
+                    "mixHash" : "0x6b8c55c97c4c00fb6261f0d1ab899358ec6c0a4e64d06579572c95040820ae45",
+                    "nonce" : "0x9652e641deedb322",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x81888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22",
-                    "stateRoot" : "0x33e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9be",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0d0ba27dfac8a1720dda5ce64b0ca4764efac5ca26cc08971e0bf57db55a2aa448821b52c4382d3c086f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a06b8c55c97c4c00fb6261f0d1ab899358ec6c0a4e64d06579572c95040820ae45889652e641deedb322f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x433c184189f0e22498eace9cc9445791bd2fb4f03e67bacaf16c35af602881fc",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdf7b8a2f92187483f2fadbe575a792fe7e323ae6ac7248714b95e60d7abc5085",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x456391824505e112",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7521eee",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_1000000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_1_1000000_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/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0fde18",
-                    "hash" : "0xa245a6c80021ca7a118e2f419ed30c79ce5e0d80c064a7d2f6e772fe0d87fdab",
-                    "mixHash" : "0xae2d306ba725d00dea7baa32fe4772968198a8f7e8d667be09580a0bc5c7409a",
-                    "nonce" : "0x232735a0f79817b7",
+                    "hash" : "0x17840e76883c12aaca183adcbdaefb32efbae4e01c1171b121e542c4daa18c01",
+                    "mixHash" : "0xa7ad5860864cfa0fcfc9e738f30ed0b50118290e893e9dd27370e49d9b05fe7d",
+                    "nonce" : "0xf29e4aa6b3d06346",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x81888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0ae2d306ba725d00dea7baa32fe4772968198a8f7e8d667be09580a0bc5c7409a88232735a0f79817b7f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0a7ad5860864cfa0fcfc9e738f30ed0b50118290e893e9dd27370e49d9b05fe7d88f29e4aa6b3d06346f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa245a6c80021ca7a118e2f419ed30c79ce5e0d80c064a7d2f6e772fe0d87fdab",
-        "network" : "Homestead",
+        "lastblockhash" : "0x17840e76883c12aaca183adcbdaefb32efbae4e01c1171b121e542c4daa18c01",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_1000000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_1_1000000_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/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x030577",
-                    "hash" : "0xd7ff12aae58e07c5f139f25652ee272b84363419d05d23f0633f7ef8eeadaa84",
-                    "mixHash" : "0x5ee7c66b9c096bb3ed782c564c1bc6d1b9fad109d418f09a16014a13c21c04b4",
-                    "nonce" : "0xf342f3fd48a759f8",
+                    "gasUsed" : "0x0fde18",
+                    "hash" : "0x24eaa139aadbb6ff15be151e2527c0bd9fb3d1bcc5f98cd0837610965c63bfe7",
+                    "mixHash" : "0x547f67335df068ba722f85795f1fce6e55b09bc7f87f0be323922bb26b50910b",
+                    "nonce" : "0xbd8288d3dcadb07e",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6",
-                    "stateRoot" : "0x165e538a736ad96662636a845ebae19a9ef9aca2fe4a00b8d8a163370c0f103d",
+                    "receiptTrie" : "0x81888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22",
+                    "stateRoot" : "0x33e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9be",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x04a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0165e538a736ad96662636a845ebae19a9ef9aca2fe4a00b8d8a163370c0f103da004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a0ce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305778203e880a05ee7c66b9c096bb3ed782c564c1bc6d1b9fad109d418f09a16014a13c21c04b488f342f3fd48a759f8f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea004a89935a6bd4271485ace3d42fda8f9bfbea5065bd5afadcce10c93e3977fb0a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0547f67335df068ba722f85795f1fce6e55b09bc7f87f0be323922bb26b50910b88bd8288d3dcadb07ef90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09086317aeee5a5cdac595ad363eae94ea67a0fda6fe1e8b4b3e9d74a8f8bffdba00c020af68538ea655de09f2123a1fe84432ec9f7a96ac49a9496857eea6065f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7ff12aae58e07c5f139f25652ee272b84363419d05d23f0633f7ef8eeadaa84",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x24eaa139aadbb6ff15be151e2527c0bd9fb3d1bcc5f98cd0837610965c63bfe7",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f90871",
+                "balance" : "0x456391824505e112",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75ef78f",
+                "balance" : "0x0de0b6b3a7521eee",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json
index 9b0975681..9f8d697a1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_1_155000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_1_155000_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/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x2ea92e6f5f733a91cb5728b037176448a6352fa65e5e62ddd408c0d0391374b5",
-                    "mixHash" : "0x3c877193df0f370062de1dc15183d2ac5a935d06d8ae852095930d1738e6b3be",
-                    "nonce" : "0x90557b2468d77aa9",
+                    "gasUsed" : "0x02f950",
+                    "hash" : "0x190171fceb50da7a0f485b204f50495fbd8e8707f57f5454cd8603bdf8573d67",
+                    "mixHash" : "0x0cd53bf7d9713c6c27543f3a610c8465495da9868f9dd3f7500aae8c2d540107",
+                    "nonce" : "0xa29ce9b8eca4766f",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
+                    "stateRoot" : "0x1984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a03c877193df0f370062de1dc15183d2ac5a935d06d8ae852095930d1738e6b3be8890557b2468d77aa9f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a00cd53bf7d9713c6c27543f3a610c8465495da9868f9dd3f7500aae8c2d54010788a29ce9b8eca4766ff90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ea92e6f5f733a91cb5728b037176448a6352fa65e5e62ddd408c0d0391374b5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x190171fceb50da7a0f485b204f50495fbd8e8707f57f5454cd8603bdf8573d67",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f8fc4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a75f03b6",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_1_155000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_1_155000_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/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x02f950",
+                    "hash" : "0x452e08d54e3bbcc012dea5cea9dc563b59734b24ea25dc1d68ad3d3a84299ef5",
+                    "mixHash" : "0x5ab30a6f750c15bc694c7f25e29b50e97831e27df5d2242aabe51960bf3f63d4",
+                    "nonce" : "0xa95e70f3b96ab8a9",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
+                    "stateRoot" : "0x1984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a05ab30a6f750c15bc694c7f25e29b50e97831e27df5d2242aabe51960bf3f63d488a95e70f3b96ab8a9f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02f950",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9",
+                        "s" : "0x5e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x452e08d54e3bbcc012dea5cea9dc563b59734b24ea25dc1d68ad3d3a84299ef5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f8fc4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75f03b6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_1_155000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x47a3af6a309a37ca0497d9c5b3785f0abe1e1256b3a34f248b802b2215c4e1f9",
-                    "mixHash" : "0xf839efa0d37e7198147ca7e9367dfbb02c28168b50c73ca9c9788de49ea7d9c2",
-                    "nonce" : "0x2369f37056815756",
+                    "hash" : "0xe883e60a9e0aa263defaee142524a55f9f9a8caf3dcb6319f2360fde4d93fefc",
+                    "mixHash" : "0xdbe7f0244f3d6b81a86727aeebff50182be69ed9cd25bde611a4a162d328d5ac",
+                    "nonce" : "0xa45f892580e2571f",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0f839efa0d37e7198147ca7e9367dfbb02c28168b50c73ca9c9788de49ea7d9c2882369f37056815756f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0dbe7f0244f3d6b81a86727aeebff50182be69ed9cd25bde611a4a162d328d5ac88a45f892580e2571ff90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47a3af6a309a37ca0497d9c5b3785f0abe1e1256b3a34f248b802b2215c4e1f9",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe883e60a9e0aa263defaee142524a55f9f9a8caf3dcb6319f2360fde4d93fefc",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_155000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_1_155000_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/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02f950",
-                    "hash" : "0xbdec98b488d20af6815fb3c3ab9a953ad107e91168acd9cc0cce00310d1970d6",
-                    "mixHash" : "0x5e3a089692662a962ddf065b27f637b038d8fe5bb1a2404c0e90dd36111b29d8",
-                    "nonce" : "0x8ae76daaed0e632f",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0xf9ddeeea39cc0f333fa2449350c221b57255f06dee8c5d99340728d9943f34e3",
+                    "mixHash" : "0x39fb3cb23f0abddbb078e3da645aa4c410d5263a794c0cda7bda8a60118c2aa2",
+                    "nonce" : "0x32421ecbf306efcd",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91",
-                    "stateRoot" : "0x31be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645f",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a05e3a089692662a962ddf065b27f637b038d8fe5bb1a2404c0e90dd36111b29d8888ae76daaed0e632ff90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a039fb3cb23f0abddbb078e3da645aa4c410d5263a794c0cda7bda8a60118c2aa28832421ecbf306efcdf90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdec98b488d20af6815fb3c3ab9a953ad107e91168acd9cc0cce00310d1970d6",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf9ddeeea39cc0f333fa2449350c221b57255f06dee8c5d99340728d9943f34e3",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8fc4a",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f03b6",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_155000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_1_155000_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/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x86cb21efdffb5c0a7c65c819cdebdd86417a01af59bda9c78dc95d3aa67c2ae0",
-                    "mixHash" : "0x2cbc7dc361c2998cfe1fd9d6a45793a9529610bed94ac625a2c720d6470a71f0",
-                    "nonce" : "0x31378df325fb25da",
+                    "hash" : "0x6f4334ea96129b5d7282c7b2f5663ccf8e7446476f18a91b994161ba84b184b1",
+                    "mixHash" : "0x4036e8af4fe4d398a1857f84114625c6122b3bcdf20b62851452acfcb3e1f88c",
+                    "nonce" : "0x89544e2d705bff42",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a02cbc7dc361c2998cfe1fd9d6a45793a9529610bed94ac625a2c720d6470a71f08831378df325fb25daf90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a04036e8af4fe4d398a1857f84114625c6122b3bcdf20b62851452acfcb3e1f88c8889544e2d705bff42f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86cb21efdffb5c0a7c65c819cdebdd86417a01af59bda9c78dc95d3aa67c2ae0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6f4334ea96129b5d7282c7b2f5663ccf8e7446476f18a91b994161ba84b184b1",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_155000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_1_155000_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/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x90f7a306ae2bd4930bf916e14704d7825160ad2e12099686195cb3dde8f8dc4b",
-                    "mixHash" : "0x1c53c66499b113acf6e26ae2f29b656e60ffd3bcc984a43f4830700b48fe327d",
-                    "nonce" : "0x5a879b289b0ef3ec",
+                    "hash" : "0xffa029b3ac3d67ad92c9190a0aefc774469beca0b8d3023e5978a412751d8d15",
+                    "mixHash" : "0x922d65c4756daf5096b46cec0523194318fed2d16354840025c9a6d63f39f098",
+                    "nonce" : "0x26771dc7ebff1e20",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
-                    "stateRoot" : "0x1984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202",
+                    "receiptTrie" : "0xce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91",
+                    "stateRoot" : "0x31be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202a00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a01c53c66499b113acf6e26ae2f29b656e60ffd3bcc984a43f4830700b48fe327d885a879b289b0ef3ecf90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa00dde86af8f4130420ebcc8237bc8555073b5876a0b7e0ce8258439aa5f712a97a0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0922d65c4756daf5096b46cec0523194318fed2d16354840025c9a6d63f39f0988826771dc7ebff1e20f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba09f012c44765a5c29d88b8dea699f901c88bf969f60946b0dddf7741715fdc5e9a05e82d7c821c92b99a70f2af7301cfcaa2127712348551f52200ff640ad1bed3cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90f7a306ae2bd4930bf916e14704d7825160ad2e12099686195cb3dde8f8dc4b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xffa029b3ac3d67ad92c9190a0aefc774469beca0b8d3023e5978a412751d8d15",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f8fc4a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json
index 8971aca81..db8c1613b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_1_20500_d0g0v0_EIP150" : {
+    "modexp_37120_37111_1_20500_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/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x644b460ad1a17fd7103b0aa788d9651364d663c73aeb815ea0b2f505a8853717",
-                    "mixHash" : "0x2c25599ffe32f550f170dd4f0e612ee60567b6813dae5b2c011c103d67459d85",
-                    "nonce" : "0x1f9ced1e777ed94d",
+                    "hash" : "0xcba16bc53d3f4dda78ee75bd51ae2c4a2cbf633f6e9918a185dccb839240ba10",
+                    "mixHash" : "0xa2c4f0df2fc8a0d6fbb63fc202174cdf4488de14cb2abe95b3392bd1a62958bb",
+                    "nonce" : "0x559bca67cdebf9b2",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
-                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
+                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
+                    "stateRoot" : "0x46e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a02c25599ffe32f550f170dd4f0e612ee60567b6813dae5b2c011c103d67459d85881f9ced1e777ed94df90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701da0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0a2c4f0df2fc8a0d6fbb63fc202174cdf4488de14cb2abe95b3392bd1a62958bb88559bca67cdebf9b2f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x644b460ad1a17fd7103b0aa788d9651364d663c73aeb815ea0b2f505a8853717",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcba16bc53d3f4dda78ee75bd51ae2c4a2cbf633f6e9918a185dccb839240ba10",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6eee6",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_20500_d0g0v0_EIP158" : {
+    "modexp_37120_37111_1_20500_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/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0xa0ebf41533c9e1f1a393f47dc376f5d820858a4ca9fe025b7dbe8221d81476e7",
-                    "mixHash" : "0x3bfa53bdf341c17ced5362275aea66338c9487de8346f2d8a7bdaefb72b99973",
-                    "nonce" : "0x447beca6d43db967",
+                    "hash" : "0x0d319c6fbd11999191ac4ff93d7ba8abeca1a6f41261824882043adfe75d3560",
+                    "mixHash" : "0xd5bcb81d34b3d669c1cd94b15178f158761c1ea9e039a35f3c4586e7c6d1c371",
+                    "nonce" : "0x831fb93fcaca199e",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
-                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
+                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
+                    "stateRoot" : "0x46e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a03bfa53bdf341c17ced5362275aea66338c9487de8346f2d8a7bdaefb72b9997388447beca6d43db967f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701da0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0d5bcb81d34b3d669c1cd94b15178f158761c1ea9e039a35f3c4586e7c6d1c37188831fb93fcaca199ef90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0ebf41533c9e1f1a393f47dc376f5d820858a4ca9fe025b7dbe8221d81476e7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0d319c6fbd11999191ac4ff93d7ba8abeca1a6f41261824882043adfe75d3560",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6eee6",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_20500_d0g0v0_Frontier" : {
+    "modexp_37120_37111_1_20500_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/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0xf7c1edb1fe2fba2fd28b02275bc7fc36739212806db88befc1bc8b0360403a05",
-                    "mixHash" : "0x364fcf6294e190687e9fa6f4820d3500f88287fb060a7e348de43b8a62188f67",
-                    "nonce" : "0xf58a41a306742c34",
+                    "hash" : "0x64fcdcca6b61a725bca199114825007d423fadf8e5e2451b2a92e01170d9320a",
+                    "mixHash" : "0x326bc6a6de5f2016770698de1daf14ce6e6d5bb626ee995ea3a05af64b4ed258",
+                    "nonce" : "0xc1aed63adae22986",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0364fcf6294e190687e9fa6f4820d3500f88287fb060a7e348de43b8a62188f6788f58a41a306742c34f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0326bc6a6de5f2016770698de1daf14ce6e6d5bb626ee995ea3a05af64b4ed25888c1aed63adae22986f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7c1edb1fe2fba2fd28b02275bc7fc36739212806db88befc1bc8b0360403a05",
-        "network" : "Frontier",
+        "lastblockhash" : "0x64fcdcca6b61a725bca199114825007d423fadf8e5e2451b2a92e01170d9320a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_20500_d0g0v0_Homestead" : {
+    "modexp_37120_37111_1_20500_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/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x4c3b0bbe052ea35a474b9d01bc02fdc745f96139e974f5c4116f87fe8920cfcc",
-                    "mixHash" : "0x26d8c9bf4f565eede0826e1697d58d20cc3f36fb7bf00fb725ed207ae9be42e4",
-                    "nonce" : "0xc0bd342b1041cd68",
+                    "hash" : "0xca45861b5874c734d2331b213a3e022a631ccfa2fdc51b90bfadc0a537beb227",
+                    "mixHash" : "0x5d7a6cd9a29c66eab1a632c4c5cf0ee4a074c63b01c961e23d16cd01836c6fae",
+                    "nonce" : "0x68dd898d6f4c1c78",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a026d8c9bf4f565eede0826e1697d58d20cc3f36fb7bf00fb725ed207ae9be42e488c0bd342b1041cd68f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a05d7a6cd9a29c66eab1a632c4c5cf0ee4a074c63b01c961e23d16cd01836c6fae8868dd898d6f4c1c78f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c3b0bbe052ea35a474b9d01bc02fdc745f96139e974f5c4116f87fe8920cfcc",
-        "network" : "Homestead",
+        "lastblockhash" : "0xca45861b5874c734d2331b213a3e022a631ccfa2fdc51b90bfadc0a537beb227",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_20500_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_1_20500_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/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0xa681bcd7578c2c84c210fa1f1c68608215c705470d53b922263639bad2fbb0e9",
-                    "mixHash" : "0xf90496ab64765631ec0eed281c2f760dc1e79d4ec9130c6f7b48005bf53b0a5d",
-                    "nonce" : "0x8abd001c608fa85b",
+                    "hash" : "0xa162cc9469b94d34ced3a12f648a52370789c22eb485bbe409581eae48388170",
+                    "mixHash" : "0xd10f2af9f0f1b180055898c23571609972c00e7207ca546f47c71c31de5a9e10",
+                    "nonce" : "0xd1485b7dd931f9da",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
-                    "stateRoot" : "0x46e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701d",
+                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
+                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701da0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0f90496ab64765631ec0eed281c2f760dc1e79d4ec9130c6f7b48005bf53b0a5d888abd001c608fa85bf90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0d10f2af9f0f1b180055898c23571609972c00e7207ca546f47c71c31de5a9e1088d1485b7dd931f9daf90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa681bcd7578c2c84c210fa1f1c68608215c705470d53b922263639bad2fbb0e9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa162cc9469b94d34ced3a12f648a52370789c22eb485bbe409581eae48388170",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6eee6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761111a",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_1_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xebec",
+                    "hash" : "0x9cf9ea45128701186b96a50bf3ac9e49921297403c69352c2aada7f09528682b",
+                    "mixHash" : "0x20e4dc90600ebd729e5f6f44ca5f9262927fa331e4740d9673fa39b110699e0c",
+                    "nonce" : "0x133f482423851488",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
+                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a0dda3b27845328a2c7417d2637a27f07acbc9e7faf013328f034f947199665b1da047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a020e4dc90600ebd729e5f6f44ca5f9262927fa331e4740d9673fa39b110699e0c88133f482423851488f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ba0a26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984a065be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xebec",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa26642b72a697ac28821cfe098934169746dc6521c6585d295f0be0379c5b984",
+                        "s" : "0x65be74a826771f367db6f58d9deb9a2710f940781f695a7e024465651fa94c55",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9cf9ea45128701186b96a50bf3ac9e49921297403c69352c2aada7f09528682b",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json
index 70ea0009b..0c12ea221 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_1_25000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_1_25000_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/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x365e02e3d9f12f664bb645be6c2d97a0daa31b0f677c562f8dee0e85c15a357b",
-                    "mixHash" : "0x5833885978acd4850eca84f58e68c0913101c82641052be7a639359d93740752",
-                    "nonce" : "0x2cfa46e0ca506069",
+                    "gasUsed" : "0xfd80",
+                    "hash" : "0xf88b8083dfa62d932d8baf956b7116a0add95e97a3e56202cc2e897806a2d1ce",
+                    "mixHash" : "0xb67c811a518e085d94150b89367b7aee92e8e72c11535b3340bf6744bea2e51b",
+                    "nonce" : "0xcc6708d0da90bd0b",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
+                    "stateRoot" : "0x7e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a05833885978acd4850eca84f58e68c0913101c82641052be7a639359d93740752882cfa46e0ca506069f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011efa0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0b67c811a518e085d94150b89367b7aee92e8e72c11535b3340bf6744bea2e51b88cc6708d0da90bd0bf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x365e02e3d9f12f664bb645be6c2d97a0daa31b0f677c562f8dee0e85c15a357b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf88b8083dfa62d932d8baf956b7116a0add95e97a3e56202cc2e897806a2d1ce",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f7007a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a760ff86",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_1_25000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_1_25000_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/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xfd80",
+                    "hash" : "0x514b595c1da24c91250c7173fe1c87774123a2350707289b2e24ce194da8a590",
+                    "mixHash" : "0xfb6c606e996b2532978a9e46d15b7f63df55108d509cee673fa0397b2e1216e8",
+                    "nonce" : "0xedddda967e3b130b",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
+                    "stateRoot" : "0x7e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011ef",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011efa0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0fb6c606e996b2532978a9e46d15b7f63df55108d509cee673fa0397b2e1216e888edddda967e3b130bf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xfd80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0",
+                        "s" : "0x3bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x514b595c1da24c91250c7173fe1c87774123a2350707289b2e24ce194da8a590",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7007a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760ff86",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_1_25000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x7c3534a2c198373bfbdd61030b4bb9342fff517f4484d639e8be67143a8c2c95",
-                    "mixHash" : "0x3908e0b850a5bb853ec0625f5ff0e13621322339c15fefc2280ca5e28248bdb5",
-                    "nonce" : "0x4264bf793c725b4b",
+                    "hash" : "0x9d6aba0fb32dbf0834aa6009092804e81253ad52c9a0a3f810f49c009350130e",
+                    "mixHash" : "0x2d5d7fb500e8392acc6b7a9774d428f916b161415c056b60d07d01137e36380b",
+                    "nonce" : "0x5453bf78b498f88a",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a03908e0b850a5bb853ec0625f5ff0e13621322339c15fefc2280ca5e28248bdb5884264bf793c725b4bf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a02d5d7fb500e8392acc6b7a9774d428f916b161415c056b60d07d01137e36380b885453bf78b498f88af90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c3534a2c198373bfbdd61030b4bb9342fff517f4484d639e8be67143a8c2c95",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9d6aba0fb32dbf0834aa6009092804e81253ad52c9a0a3f810f49c009350130e",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_25000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_1_25000_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/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xfd80",
-                    "hash" : "0x7085fff52a9e2bb0496dd59e733ec3d01136299e56cbec79a3282ff657133cd0",
-                    "mixHash" : "0x168dd6bda5cd672672926b251bb1ee816b3c37f3250ca3051e8abf9f58265f2f",
-                    "nonce" : "0x2c85424061f0df04",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x7ddc5b26f6f739259a1a29307c8f05a6ab292daa4b86354b6d0f6da2d084b2ad",
+                    "mixHash" : "0x2d9bc972332a4d06febffa078e1fb38d37bb3d15766a9bcbc4f42482211a63a0",
+                    "nonce" : "0xad8fdc4754a5c3ca",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x9dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efa",
-                    "stateRoot" : "0x7c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9c",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0168dd6bda5cd672672926b251bb1ee816b3c37f3250ca3051e8abf9f58265f2f882c85424061f0df04f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a02d9bc972332a4d06febffa078e1fb38d37bb3d15766a9bcbc4f42482211a63a088ad8fdc4754a5c3caf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7085fff52a9e2bb0496dd59e733ec3d01136299e56cbec79a3282ff657133cd0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7ddc5b26f6f739259a1a29307c8f05a6ab292daa4b86354b6d0f6da2d084b2ad",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7007a",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ff86",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_25000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_1_25000_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/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0x0d1f644fc2bc66d1b24da03a39b4ea4ef1235cff2c19cb75f8b043279619a2bd",
-                    "mixHash" : "0x31e612c456e6be3c65af59d39ec10ecc11d8ae7c92cd96ea4fdd8aad9378fe9a",
-                    "nonce" : "0x5c7a5b6ab8c82bd2",
+                    "hash" : "0xa384eaf427c7aa18ad897f70b32cd155367eeb8b6c025410ad2946437da337e4",
+                    "mixHash" : "0x065f53de8d306084605ceeeb90da1b7609fea30af2ce88447961b0ceac9541b1",
+                    "nonce" : "0x2a843acec09ee0ef",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x9dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efa",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a031e612c456e6be3c65af59d39ec10ecc11d8ae7c92cd96ea4fdd8aad9378fe9a885c7a5b6ab8c82bd2f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0065f53de8d306084605ceeeb90da1b7609fea30af2ce88447961b0ceac9541b1882a843acec09ee0eff90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d1f644fc2bc66d1b24da03a39b4ea4ef1235cff2c19cb75f8b043279619a2bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa384eaf427c7aa18ad897f70b32cd155367eeb8b6c025410ad2946437da337e4",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_25000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_1_25000_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/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0xdb82982dcaaeb7dd578640fc3a79f56bf8a6d59cf0d9fdfeb6cbc646d245fcd4",
-                    "mixHash" : "0xb3ad88040044110fb8a65c8d35994e10d80247d8a314cb94039450704509cd91",
-                    "nonce" : "0xfd16756513de85e2",
+                    "hash" : "0xe0bf2e4c618b85ee22944fc180cab5aebbcd05d702a9cc69e05ecf418ef7eee7",
+                    "mixHash" : "0x7ead0f06899046d9f1aab3f1859012386ab0ceaa4e3d5fa721c33efc5405cf9b",
+                    "nonce" : "0xab442b8683e5b8fc",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
-                    "stateRoot" : "0x7e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011ef",
+                    "receiptTrie" : "0x9dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efa",
+                    "stateRoot" : "0x7c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011efa0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0b3ad88040044110fb8a65c8d35994e10d80247d8a314cb94039450704509cd9188fd16756513de85e2f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca0d6586e4ead7722651d81850018cb6f09df71d09e02a7a822d05a016024675f9ea09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a07ead0f06899046d9f1aab3f1859012386ab0ceaa4e3d5fa721c33efc5405cf9b88ab442b8683e5b8fcf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca0cd075e9ce000407ed2219decde9dd7bf05b1a69814e57dba24f0647f9d217bd0a03bd2fd8603ed6f92aeb6a251ecaca7973b568f6edde2d56ac68aafb131370ec4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb82982dcaaeb7dd578640fc3a79f56bf8a6d59cf0d9fdfeb6cbc646d245fcd4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe0bf2e4c618b85ee22944fc180cab5aebbcd05d702a9cc69e05ecf418ef7eee7",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7007a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json
index 224a05b1b..ef6d700a0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_1_35000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_1_35000_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/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x53e1225d219aa484a386f0b60b5a68a79435e553e3c467bf82e3ca8be5bb2db2",
-                    "mixHash" : "0xa8e6fe145a09f1a28907e1cf5465bf29e3a4ea8892940ace7ac8887421128db0",
-                    "nonce" : "0x81ad586712fc26a0",
+                    "gasUsed" : "0x012490",
+                    "hash" : "0x86697b42934d1ac8213e007a48a9f839f631997a7b043662aab55f13c9c7a1b5",
+                    "mixHash" : "0x50bdabbc16936b8bae8dcfdee77a08e75aef0ee4b5ece1826f79a8134b69ca99",
+                    "nonce" : "0xd66bb073c4dabe6f",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
+                    "stateRoot" : "0x4e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0a8e6fe145a09f1a28907e1cf5465bf29e3a4ea8892940ace7ac8887421128db08881ad586712fc26a0f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992ba09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a050bdabbc16936b8bae8dcfdee77a08e75aef0ee4b5ece1826f79a8134b69ca9988d66bb073c4dabe6ff90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53e1225d219aa484a386f0b60b5a68a79435e553e3c467bf82e3ca8be5bb2db2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x86697b42934d1ac8213e007a48a9f839f631997a7b043662aab55f13c9c7a1b5",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f7278a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a760d876",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_1_35000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_1_35000_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/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x012490",
+                    "hash" : "0xc75453ee794bf7c3ed8aa5e24fe3280e81ca968c71065eacee180fa5a72032b4",
+                    "mixHash" : "0xba618715343cdec2a264f85ff81d32ff3e660dedfdd720548cb70c031e1e8d49",
+                    "nonce" : "0xc78d2d6134c23680",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
+                    "stateRoot" : "0x4e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992ba09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0ba618715343cdec2a264f85ff81d32ff3e660dedfdd720548cb70c031e1e8d4988c78d2d6134c23680f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x012490",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350",
+                        "s" : "0x3e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc75453ee794bf7c3ed8aa5e24fe3280e81ca968c71065eacee180fa5a72032b4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7278a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760d876",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_1_35000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x993ee6feaee8e8dd81c4e89fbf2d75fb21f43ac140eea847dc582abaffe53e11",
-                    "mixHash" : "0xad3f79cdf9b68b342040000ba05e8a62687d3d338658396ed4f1bc6e79357dd2",
-                    "nonce" : "0x9141e71324f6b306",
+                    "hash" : "0x742625db725924934eec33a4b8546afee86fb027772df17a4c31d221e9e36f97",
+                    "mixHash" : "0x54f25a82049a38e96fe357258acca9bb56149e926644d53a1a79d21dc847ceef",
+                    "nonce" : "0x0547929d8ee71ed2",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0ad3f79cdf9b68b342040000ba05e8a62687d3d338658396ed4f1bc6e79357dd2889141e71324f6b306f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a054f25a82049a38e96fe357258acca9bb56149e926644d53a1a79d21dc847ceef880547929d8ee71ed2f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x993ee6feaee8e8dd81c4e89fbf2d75fb21f43ac140eea847dc582abaffe53e11",
-        "network" : "EIP158",
+        "lastblockhash" : "0x742625db725924934eec33a4b8546afee86fb027772df17a4c31d221e9e36f97",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_35000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_1_35000_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/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x012490",
-                    "hash" : "0xa675c0475edb4dbf22857914af684a362cc554c6d08f5b2c81c6fead3930a3c1",
-                    "mixHash" : "0xb31aaaf0d25e1ed2e09803c9459fce5becfbe72454a764a3193434609630321e",
-                    "nonce" : "0x45e0988777731547",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0xcea2b0590541b90cfeb1dd7d15876275dfa6f1c8ed31d684b8b27fc7f0f83a09",
+                    "mixHash" : "0x0b6e0dc0ac75305d6589830993a2b843b8e57dc2beb295f4c058288766f5f987",
+                    "nonce" : "0x12e6a9fb6e090439",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084f",
-                    "stateRoot" : "0xb6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0b31aaaf0d25e1ed2e09803c9459fce5becfbe72454a764a3193434609630321e8845e0988777731547f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a00b6e0dc0ac75305d6589830993a2b843b8e57dc2beb295f4c058288766f5f9878812e6a9fb6e090439f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa675c0475edb4dbf22857914af684a362cc554c6d08f5b2c81c6fead3930a3c1",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcea2b0590541b90cfeb1dd7d15876275dfa6f1c8ed31d684b8b27fc7f0f83a09",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7278a",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760d876",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_35000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_1_35000_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/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xba18e4390b6fea31f013882013be78e7a748c25023771384fc380e882f485bfd",
-                    "mixHash" : "0xfcf6919e449c372c107c8927806ba407e91b4c0cfc6fad2c43474abe51b32169",
-                    "nonce" : "0x652b69c21f6eb4e6",
+                    "hash" : "0x5e8adb5acd8c91c3aaf7741ca64888fb55cb8a6a749f0471b4359b1cef9e7d7f",
+                    "mixHash" : "0x853db7bd17826d74ad06483632d0ae90a4d53e4de1df0432085b8a78abde924c",
+                    "nonce" : "0xec5253b1363bad3f",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084f",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0fcf6919e449c372c107c8927806ba407e91b4c0cfc6fad2c43474abe51b3216988652b69c21f6eb4e6f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0853db7bd17826d74ad06483632d0ae90a4d53e4de1df0432085b8a78abde924c88ec5253b1363bad3ff90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba18e4390b6fea31f013882013be78e7a748c25023771384fc380e882f485bfd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5e8adb5acd8c91c3aaf7741ca64888fb55cb8a6a749f0471b4359b1cef9e7d7f",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_1_35000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_1_35000_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/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xf95f6fcc02e6d427bf7d1b1d362eb15ea4f6b0b11135e0ac35a747e579840891",
-                    "mixHash" : "0x6c75bf12db6d97a100264fd67d7cee540d9818f26e6e36f27776884e87fd28fc",
-                    "nonce" : "0xb08c069e81af6fd7",
+                    "hash" : "0x8d77c3c27d0a83dd4f7b758afdf11df0bbc5610de62abfdbb442abbd71ef2e1d",
+                    "mixHash" : "0xa657121900c7eee0aaafd40305720649dee7a0719f54e6cca5c1b75617aee2c6",
+                    "nonce" : "0xed1f0e9882ff798c",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
-                    "stateRoot" : "0x4e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992b",
+                    "receiptTrie" : "0xac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084f",
+                    "stateRoot" : "0xb6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992ba09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a06c75bf12db6d97a100264fd67d7cee540d9818f26e6e36f27776884e87fd28fc88b08c069e81af6fd7f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a09925e40994154626ace94cb6b1c6f0b59bc1bbf1b5714f59683b9d9b26a5ec91a0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0a657121900c7eee0aaafd40305720649dee7a0719f54e6cca5c1b75617aee2c688ed1f0e9882ff798cf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9701000000000000000000000000000000000000000000000000000000000000001ca07f250bc7cd62320fe5cc2bd5155fe7d410f1e849473ce3c0d4e7c07ecb399350a03e822220f199bc374e13456ac7df08323a3a8fb75e938ca3ca67ea3445e92ba1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf95f6fcc02e6d427bf7d1b1d362eb15ea4f6b0b11135e0ac35a747e579840891",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8d77c3c27d0a83dd4f7b758afdf11df0bbc5610de62abfdbb442abbd71ef2e1d",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7278a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json
index 9018cdd94..8fb373ece 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_37111_1000000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_37111_1000000_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/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011306",
-                    "hash" : "0xab9ca354e24eff70033cd2b16e25949b092d74f919bba842fea40ad2798d7d2c",
-                    "mixHash" : "0x3f0990543ca0f976277c399b11ef3f7b3bfb4ed3dc73ac73e3b08d22d47f4cd2",
-                    "nonce" : "0x6f3dd1cd788e3085",
+                    "gasUsed" : "0x0326fb",
+                    "hash" : "0xe60115a9f6d884abf8414ef81630b3945c6ba05a7e687c0d6d61841acf140ee5",
+                    "mixHash" : "0x8738a40efd65513b5c39fbd99c31fdd1fb09dda0b0d50953b8fcb91954f375c3",
+                    "nonce" : "0xe1803144178c45f6",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
-                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
+                    "receiptTrie" : "0xc7eb7f43f64856c8b87fe111aa8ce90e750dc5b59290e9fea8281d9af3e39b19",
+                    "stateRoot" : "0x3e72f1055afb8e1bed96507036a477e2ed99b45558e42b7adca810f8a6c64069",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a03f0990543ca0f976277c399b11ef3f7b3bfb4ed3dc73ac73e3b08d22d47f4cd2886f3dd1cd788e3085f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03e72f1055afb8e1bed96507036a477e2ed99b45558e42b7adca810f8a6c64069a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0c7eb7f43f64856c8b87fe111aa8ce90e750dc5b59290e9fea8281d9af3e39b19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830326fb8203e880a08738a40efd65513b5c39fbd99c31fdd1fb09dda0b0d50953b8fcb91954f375c388e1803144178c45f6f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab9ca354e24eff70033cd2b16e25949b092d74f919bba842fea40ad2798d7d2c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe60115a9f6d884abf8414ef81630b3945c6ba05a7e687c0d6d61841acf140ee5",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f71600",
+                "balance" : "0x4563918244f929f5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ea00",
+                "balance" : "0x0de0b6b3a75ed60b",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
+                    "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_37120_37111_37111_1000000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_37111_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x0326fb",
+                    "hash" : "0x49755f8e33b6ce43a10b831f0f8758bb710c07d5cfca4b53b70042c720f92f62",
+                    "mixHash" : "0xd5734bfd426933f686e5c159bb0873995aec81912e9990e10a15c20431c56f73",
+                    "nonce" : "0x072897103f73e217",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0xc7eb7f43f64856c8b87fe111aa8ce90e750dc5b59290e9fea8281d9af3e39b19",
+                    "stateRoot" : "0x3e72f1055afb8e1bed96507036a477e2ed99b45558e42b7adca810f8a6c64069",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03e72f1055afb8e1bed96507036a477e2ed99b45558e42b7adca810f8a6c64069a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0c7eb7f43f64856c8b87fe111aa8ce90e750dc5b59290e9fea8281d9af3e39b19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830326fb8203e880a0d5734bfd426933f686e5c159bb0873995aec81912e9990e10a15c20431c56f7388072897103f73e217f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x0fff58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33",
+                        "s" : "0x70cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x49755f8e33b6ce43a10b831f0f8758bb710c07d5cfca4b53b70042c720f92f62",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f929f5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75ed60b",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_37111_1000000_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/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011306",
-                    "hash" : "0x4f2161d0e762323bb9c27699c0b9c891a7ba0f9218cb2b0b3c64fe12cc65a787",
-                    "mixHash" : "0x3c8e95e99f5ee443563b6801e4f91842f214922ee1ee7361bb0354dc664c9506",
-                    "nonce" : "0xdb00bf325d6f8c39",
+                    "hash" : "0xe98e45a3d893f7a60e0e6938fb837f6572a31e6b964583cc093fdcbae13c9f5c",
+                    "mixHash" : "0xeb73d46b07920ed5ca619fbee84079ebe126a83484e7d516259343a4cfed66a5",
+                    "nonce" : "0x3d1247daabbcff08",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a03c8e95e99f5ee443563b6801e4f91842f214922ee1ee7361bb0354dc664c950688db00bf325d6f8c39f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0eb73d46b07920ed5ca619fbee84079ebe126a83484e7d516259343a4cfed66a5883d1247daabbcff08f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f2161d0e762323bb9c27699c0b9c891a7ba0f9218cb2b0b3c64fe12cc65a787",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe98e45a3d893f7a60e0e6938fb837f6572a31e6b964583cc093fdcbae13c9f5c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_1000000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_37111_1000000_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/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0fff58",
-                    "hash" : "0xdd2a2bae4b57a36d8d52627ddefb25027066c827e5a2e02dff713b74120befe9",
-                    "mixHash" : "0xc4bbd2f66b4a2228dbef2073e40edf503223e0e7d8cb13b1ee7dfd79b8e62ac4",
-                    "nonce" : "0xae9abd8f6aaab799",
+                    "gasUsed" : "0x011306",
+                    "hash" : "0x7c38d90f0bc7c07b2678f8d1603ce42cc496500adbebe9c6f1dd73fd03b1d320",
+                    "mixHash" : "0xaa519b996c1ec13d10e96453ec8b820149575f7b85c15797c97fd1d96eb813ce",
+                    "nonce" : "0x108bc34068569f5c",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8",
-                    "stateRoot" : "0x58ccb34846d43e86bc6d9030e9b6a8bfae00a86201b50fbc2cc0e37b8cf3346e",
+                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
+                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a058ccb34846d43e86bc6d9030e9b6a8bfae00a86201b50fbc2cc0e37b8cf3346ea0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fff588203e880a0c4bbd2f66b4a2228dbef2073e40edf503223e0e7d8cb13b1ee7dfd79b8e62ac488ae9abd8f6aaab799f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0aa519b996c1ec13d10e96453ec8b820149575f7b85c15797c97fd1d96eb813ce88108bc34068569f5cf90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd2a2bae4b57a36d8d52627ddefb25027066c827e5a2e02dff713b74120befe9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7c38d90f0bc7c07b2678f8d1603ce42cc496500adbebe9c6f1dd73fd03b1d320",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245060252",
+                "balance" : "0x4563918244f71600",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a751fdae",
+                "balance" : "0x0de0b6b3a760ea00",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_1000000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_37111_1000000_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/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0fff58",
-                    "hash" : "0x7af26f01c670fa4e7f1a2de0166b4b6eff212ec6b0dd5eef3c912f0170904454",
-                    "mixHash" : "0xbcf78c93cde428c2017681751a80c6bf4d6c8bc01dc3654e5e7875c2fda661a7",
-                    "nonce" : "0x2c98c09e559cc66c",
+                    "hash" : "0x04f8b0695eb95e25ab60f135e406060631db8ee2bedab0007290ae6531734015",
+                    "mixHash" : "0x8f7281fa062db81c6d6d8d2a05089ebd232da046736fcf6006ad5a4c408820c3",
+                    "nonce" : "0xff7d2eacb690af95",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a058ccb34846d43e86bc6d9030e9b6a8bfae00a86201b50fbc2cc0e37b8cf3346ea0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fff588203e880a0bcf78c93cde428c2017681751a80c6bf4d6c8bc01dc3654e5e7875c2fda661a7882c98c09e559cc66cf90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a058ccb34846d43e86bc6d9030e9b6a8bfae00a86201b50fbc2cc0e37b8cf3346ea0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fff588203e880a08f7281fa062db81c6d6d8d2a05089ebd232da046736fcf6006ad5a4c408820c388ff7d2eacb690af95f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7af26f01c670fa4e7f1a2de0166b4b6eff212ec6b0dd5eef3c912f0170904454",
-        "network" : "Homestead",
+        "lastblockhash" : "0x04f8b0695eb95e25ab60f135e406060631db8ee2bedab0007290ae6531734015",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_1000000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_37111_1000000_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/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0326fb",
-                    "hash" : "0xa5c742bfd10aa62016141350f40f1f7692d20a281aad1ec8af3c3add8aba7248",
-                    "mixHash" : "0xf5314c7d18f4b75c5b3621f7b5356faed2f22ef1b45dd493d7c396b8d5534102",
-                    "nonce" : "0x3a2aa0e95f0148ff",
+                    "gasUsed" : "0x0fff58",
+                    "hash" : "0xf05ca7855527bfffb21e079dccece82f0428095c71e3a5c17b23c80f12d1d265",
+                    "mixHash" : "0x68acccade893ebf8c77279987c1e458c6dfb439adb228404a23a24d2bc3817ad",
+                    "nonce" : "0x54e4eb9e7fc76b97",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0xc7eb7f43f64856c8b87fe111aa8ce90e750dc5b59290e9fea8281d9af3e39b19",
-                    "stateRoot" : "0x3e72f1055afb8e1bed96507036a477e2ed99b45558e42b7adca810f8a6c64069",
+                    "receiptTrie" : "0x616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8",
+                    "stateRoot" : "0x58ccb34846d43e86bc6d9030e9b6a8bfae00a86201b50fbc2cc0e37b8cf3346e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37ed",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03e72f1055afb8e1bed96507036a477e2ed99b45558e42b7adca810f8a6c64069a0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0c7eb7f43f64856c8b87fe111aa8ce90e750dc5b59290e9fea8281d9af3e39b19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830326fb8203e880a0f5314c7d18f4b75c5b3621f7b5356faed2f22ef1b45dd493d7c396b8d5534102883a2aa0e95f0148fff90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a058ccb34846d43e86bc6d9030e9b6a8bfae00a86201b50fbc2cc0e37b8cf3346ea0c0149e0091d7f3ac9c6b24e2caa82334324265b939cfe21a14648d37d21f37eda0616814cbba0c92c1299d3dbe5652887056714874978e2ed6590855b529206cd8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fff588203e880a068acccade893ebf8c77279987c1e458c6dfb439adb228404a23a24d2bc3817ad8854e4eb9e7fc76b97f90289f902860101830fff5894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00f08e94549931076803819ab32b4f43782689f4a69e8385cfb8e00e0e2c3bc33a070cc1815d459ec043d20190b5999191a9cd7fd4da38e12952d07fa97b1795206c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5c742bfd10aa62016141350f40f1f7692d20a281aad1ec8af3c3add8aba7248",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf05ca7855527bfffb21e079dccece82f0428095c71e3a5c17b23c80f12d1d265",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f929f5",
+                "balance" : "0x4563918245060252",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75ed60b",
+                "balance" : "0x0de0b6b3a751fdae",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json
index 756890cc3..88df29c89 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_37111_155000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_37111_155000_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/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011306",
-                    "hash" : "0xe978bd3002b23c12dd4e0506c3f3bd0f82819b24b17d4f282ef99b41a0865e8b",
-                    "mixHash" : "0xb9caa5481bd8188676f15e6342bb4b3c65e2d5c5603a937085cb1b5da65720fc",
-                    "nonce" : "0x69e20b0a959937ac",
+                    "gasUsed" : "0x031a90",
+                    "hash" : "0x479021275aa66d7c072927a967604d484898014388ee47b903718bd8597482d8",
+                    "mixHash" : "0xbd01c203ddb03514aac982665df0bb2f991989c07f100373c68e567f922a415b",
+                    "nonce" : "0x54096fa8715ed2cd",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
-                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
+                    "receiptTrie" : "0x3a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3a",
+                    "stateRoot" : "0xd737c7566ad4a5a030a8af9291df01a428bd34fa13a181c6bbb701c65f3d39b2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0b9caa5481bd8188676f15e6342bb4b3c65e2d5c5603a937085cb1b5da65720fc8869e20b0a959937acf90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d737c7566ad4a5a030a8af9291df01a428bd34fa13a181c6bbb701c65f3d39b2a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca03a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a0bd01c203ddb03514aac982665df0bb2f991989c07f100373c68e567f922a415b8854096fa8715ed2cdf90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe978bd3002b23c12dd4e0506c3f3bd0f82819b24b17d4f282ef99b41a0865e8b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x479021275aa66d7c072927a967604d484898014388ee47b903718bd8597482d8",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f71600",
+                "balance" : "0x4563918244f91d8a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ea00",
+                "balance" : "0x0de0b6b3a75ee276",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_37111_155000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_37111_155000_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/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x031a90",
+                    "hash" : "0x0ce93c22dee4e75773abd9becf9cec5c0d4d86441895d4a894b0427576c8bcff",
+                    "mixHash" : "0x3157a2dbb6025136035794a9c40848afc74b44a1b97989ed6901ee3a6937cf29",
+                    "nonce" : "0xe7b42d7d9cd0910c",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x3a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3a",
+                    "stateRoot" : "0xd737c7566ad4a5a030a8af9291df01a428bd34fa13a181c6bbb701c65f3d39b2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d737c7566ad4a5a030a8af9291df01a428bd34fa13a181c6bbb701c65f3d39b2a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca03a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a03157a2dbb6025136035794a9c40848afc74b44a1b97989ed6901ee3a6937cf2988e7b42d7d9cd0910cf90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x031a90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84f",
+                        "s" : "0x4fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0ce93c22dee4e75773abd9becf9cec5c0d4d86441895d4a894b0427576c8bcff",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f91d8a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75ee276",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_37111_155000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011306",
-                    "hash" : "0xec04ca69b3f606b51860c9716bb64e5d0716fc8ae1d3be33a324ee1606eb5103",
-                    "mixHash" : "0xe671ab8768bebd0b24952a1ab0bf7fe7cae3f1d86403b5ab7e929519e7539227",
-                    "nonce" : "0x773aa8941ea4fd51",
+                    "hash" : "0xdd7b95c4d0fe6cf13dd2bc9a07c24be5a8f429fad58c1147b9160da79f33878e",
+                    "mixHash" : "0x3ef3aea8f2c24c765e228fdf606ab2ffc0e7975ce6c4b445bdb74a3dff4a26e8",
+                    "nonce" : "0x37b5a63fef4f9ee0",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0e671ab8768bebd0b24952a1ab0bf7fe7cae3f1d86403b5ab7e929519e753922788773aa8941ea4fd51f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a03ef3aea8f2c24c765e228fdf606ab2ffc0e7975ce6c4b445bdb74a3dff4a26e88837b5a63fef4f9ee0f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec04ca69b3f606b51860c9716bb64e5d0716fc8ae1d3be33a324ee1606eb5103",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdd7b95c4d0fe6cf13dd2bc9a07c24be5a8f429fad58c1147b9160da79f33878e",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_155000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_37111_155000_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/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x031a90",
-                    "hash" : "0x92f7b15cb05c79353d33cf4b44222781afa247403c9e1b7a4f69ac16b684bcac",
-                    "mixHash" : "0x37b9480c17bea93c2166017bef412c2335f21a94cb497a07358e755b8dca87e4",
-                    "nonce" : "0x72eb2370f82fcfe4",
+                    "gasUsed" : "0x011306",
+                    "hash" : "0xe37d27cf7baf9da26fb975d2cda2a24c4ded652205914537f097ce19a790ce81",
+                    "mixHash" : "0x0cc9deec1a1beba061280bf561f034fd8ea64ccd7f9858180be59ee4fbfa9302",
+                    "nonce" : "0xce077395f137943f",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82",
-                    "stateRoot" : "0x640ce3a87eb3cc8e0d810f4882624af9ccf23dd1c6f286cc97f0c0ab8de0a84b",
+                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
+                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0640ce3a87eb3cc8e0d810f4882624af9ccf23dd1c6f286cc97f0c0ab8de0a84ba0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca0744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a037b9480c17bea93c2166017bef412c2335f21a94cb497a07358e755b8dca87e48872eb2370f82fcfe4f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a00cc9deec1a1beba061280bf561f034fd8ea64ccd7f9858180be59ee4fbfa930288ce077395f137943ff90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92f7b15cb05c79353d33cf4b44222781afa247403c9e1b7a4f69ac16b684bcac",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe37d27cf7baf9da26fb975d2cda2a24c4ded652205914537f097ce19a790ce81",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f91d8a",
+                "balance" : "0x4563918244f71600",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75ee276",
+                "balance" : "0x0de0b6b3a760ea00",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_155000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_37111_155000_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/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x031a90",
-                    "hash" : "0x0fbf46450ba331dfa32d28d10dfa4fc0e29af74da20cebd51c700f39555a4907",
-                    "mixHash" : "0xd96d61a4d069182faff0e51da8f5c41d374682b0b3627319a9b2f91b3305c195",
-                    "nonce" : "0xb6309098b5498739",
+                    "hash" : "0xa6d898e36e66981b06fac4551fc10a93f3b7ff9a0e0a14073ce2470c90cef1a1",
+                    "mixHash" : "0xb28b85eeb30362258ace432fd3ae91245b97ff19ffdd47b4c956cb08514505fc",
+                    "nonce" : "0x2d702d14a9186ac3",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0640ce3a87eb3cc8e0d810f4882624af9ccf23dd1c6f286cc97f0c0ab8de0a84ba0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca0744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a0d96d61a4d069182faff0e51da8f5c41d374682b0b3627319a9b2f91b3305c19588b6309098b5498739f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0640ce3a87eb3cc8e0d810f4882624af9ccf23dd1c6f286cc97f0c0ab8de0a84ba0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca0744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a0b28b85eeb30362258ace432fd3ae91245b97ff19ffdd47b4c956cb08514505fc882d702d14a9186ac3f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fbf46450ba331dfa32d28d10dfa4fc0e29af74da20cebd51c700f39555a4907",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa6d898e36e66981b06fac4551fc10a93f3b7ff9a0e0a14073ce2470c90cef1a1",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_155000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_37111_155000_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/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x031a90",
-                    "hash" : "0x30bdf2ec0ce02476419b3bfd7192c090f52e08ad09a1a85a3149f9aa5fb66411",
-                    "mixHash" : "0x0ab00b5e5de066072ae0cd4207193b9f746ced95755c7acd3c7d30d837978e47",
-                    "nonce" : "0xb084af1ab4c890d8",
+                    "hash" : "0xe5dd45e48b7721c0b04c4ec64b19742739d9f33e04f8bb7c5fe3db38e2b43c44",
+                    "mixHash" : "0xb2bec451f52120278f7b99049985c2e13ba1d555de71a784b50cd0c29e7d07a3",
+                    "nonce" : "0xefda610a30aac055",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x3a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3a",
-                    "stateRoot" : "0xd737c7566ad4a5a030a8af9291df01a428bd34fa13a181c6bbb701c65f3d39b2",
+                    "receiptTrie" : "0x744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82",
+                    "stateRoot" : "0x640ce3a87eb3cc8e0d810f4882624af9ccf23dd1c6f286cc97f0c0ab8de0a84b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d737c7566ad4a5a030a8af9291df01a428bd34fa13a181c6bbb701c65f3d39b2a0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca03a8142f0b9e11966bb1d89824f452c4acd340a4a299fec41c4dfc752fb170a3ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a00ab00b5e5de066072ae0cd4207193b9f746ced95755c7acd3c7d30d837978e4788b084af1ab4c890d8f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0640ce3a87eb3cc8e0d810f4882624af9ccf23dd1c6f286cc97f0c0ab8de0a84ba0d9c6a6ae831ae5858978288df2109b4b882aa7daae0ffec17f2505e1c536988ca0744f8192021da108aada9011398aa5d126b83fa67427c44a91c9d5a952793a82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083031a908203e880a0b2bec451f52120278f7b99049985c2e13ba1d555de71a784b50cd0c29e7d07a388efda610a30aac055f90289f90286010183031a9094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0c2077cb32ed85d0ae05c40ded3fdb66778f69c5edcddc1601391e72d5aa6c84fa04fa427e1019dd0e9107b15b52cfc35c3e41c640ca0189e3073b1c8c1c8400d31c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30bdf2ec0ce02476419b3bfd7192c090f52e08ad09a1a85a3149f9aa5fb66411",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe5dd45e48b7721c0b04c4ec64b19742739d9f33e04f8bb7c5fe3db38e2b43c44",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f91d8a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json
index e834e0bf3..c33df9306 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_37111_20500_d0g0v0_EIP150" : {
+    "modexp_37120_37111_37111_20500_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/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010d2c",
-                    "hash" : "0x381de07dad02bef99086c9e7535e19c3a99d76d161258e2b5ea80ca17cb350e7",
-                    "mixHash" : "0xeb51c904b1fc8dc351c46ef3f72c29bf183ca5b48cb88d0839ad129e3839ed5e",
-                    "nonce" : "0xb976565907af8b1b",
+                    "hash" : "0x8a9bc5f0d55f81457c9c96b556adfd985ed33a7333459ae5a8b67201320280d1",
+                    "mixHash" : "0x9fb5a87222c282ed4c86d36d7dbfe2ff260da7a928137f15182f76bf839fa10b",
+                    "nonce" : "0x26468b97ba9af101",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x00e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3",
-                    "stateRoot" : "0xe22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6",
+                    "receiptTrie" : "0x584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19",
+                    "stateRoot" : "0xdd2af41dd4ee2b8f85cf443dc304c7dbe3d3c5eb3f8ea163b082548a80f07e2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a0eb51c904b1fc8dc351c46ef3f72c29bf183ca5b48cb88d0839ad129e3839ed5e88b976565907af8b1bf90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dd2af41dd4ee2b8f85cf443dc304c7dbe3d3c5eb3f8ea163b082548a80f07e2ea05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a0584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a09fb5a87222c282ed4c86d36d7dbfe2ff260da7a928137f15182f76bf839fa10b8826468b97ba9af101f90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x381de07dad02bef99086c9e7535e19c3a99d76d161258e2b5ea80ca17cb350e7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8a9bc5f0d55f81457c9c96b556adfd985ed33a7333459ae5a8b67201320280d1",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f71026",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_20500_d0g0v0_EIP158" : {
+    "modexp_37120_37111_37111_20500_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/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010d2c",
-                    "hash" : "0x79c142dd17070bfa0004ca2a7d6c3c08e57bdd8a341b51c76ca92309d86fcdab",
-                    "mixHash" : "0x0277f81ecaf4849bea470e3cb0697532cbec47b92180c11a4bcbe994f97a0a60",
-                    "nonce" : "0x7465f2273d30d38d",
+                    "hash" : "0xdf214d1f5b301e44928a2d767229b0319b29d97015023879983898a81a0603eb",
+                    "mixHash" : "0x636e53bb160d5268ccdcbaeec9bdc2d1c913fede8a3276037713e581ccc81dfd",
+                    "nonce" : "0x9564b84bcb6b2b0d",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x00e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3",
-                    "stateRoot" : "0xe22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6",
+                    "receiptTrie" : "0x584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19",
+                    "stateRoot" : "0xdd2af41dd4ee2b8f85cf443dc304c7dbe3d3c5eb3f8ea163b082548a80f07e2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a00277f81ecaf4849bea470e3cb0697532cbec47b92180c11a4bcbe994f97a0a60887465f2273d30d38df90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dd2af41dd4ee2b8f85cf443dc304c7dbe3d3c5eb3f8ea163b082548a80f07e2ea05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a0584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a0636e53bb160d5268ccdcbaeec9bdc2d1c913fede8a3276037713e581ccc81dfd889564b84bcb6b2b0df90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79c142dd17070bfa0004ca2a7d6c3c08e57bdd8a341b51c76ca92309d86fcdab",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdf214d1f5b301e44928a2d767229b0319b29d97015023879983898a81a0603eb",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f71026",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_20500_d0g0v0_Frontier" : {
+    "modexp_37120_37111_37111_20500_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/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010d2c",
-                    "hash" : "0xe21f1167d629a8d73205afd7ddac86e17cd07b0f3e82fc2b276458c23943af21",
-                    "mixHash" : "0x0ec1c9cb90cd710b21b5e8fe4d75c5b3fc8820f2ca48ce28953ed7f74a5785cf",
-                    "nonce" : "0xb600cdb7ec010f4b",
+                    "hash" : "0xcdae2f7e8b2cfd733bf3ccda5699442bb5a06ba32791464555f7201fec8d3470",
+                    "mixHash" : "0x9db730316a2c1f4da6ef86f51f0e27fafb3a3fc299743eceae498cf560405c2d",
+                    "nonce" : "0xd9deb8bf83b209cf",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x00e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a00ec1c9cb90cd710b21b5e8fe4d75c5b3fc8820f2ca48ce28953ed7f74a5785cf88b600cdb7ec010f4bf90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a09db730316a2c1f4da6ef86f51f0e27fafb3a3fc299743eceae498cf560405c2d88d9deb8bf83b209cff90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe21f1167d629a8d73205afd7ddac86e17cd07b0f3e82fc2b276458c23943af21",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcdae2f7e8b2cfd733bf3ccda5699442bb5a06ba32791464555f7201fec8d3470",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_20500_d0g0v0_Homestead" : {
+    "modexp_37120_37111_37111_20500_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/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010d2c",
-                    "hash" : "0xf9c436f5740cfec33134e41814247783907712477371c168380edf39c7fddfee",
-                    "mixHash" : "0x02151b1238888df6c86f3983cf285f02016565e953485b47368c7b9ad378cc18",
-                    "nonce" : "0xc4f47f36fe8ab15f",
+                    "hash" : "0x69553558eae0c634c78c94895be149b1b6d81db1e0eb972a795ec2c75edf21e2",
+                    "mixHash" : "0x02a225654d151e34dbf187798d1547e7eb2b019774656ee963d4e71f0cf86143",
+                    "nonce" : "0x1240202dbdb52781",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x00e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a002151b1238888df6c86f3983cf285f02016565e953485b47368c7b9ad378cc1888c4f47f36fe8ab15ff90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a002a225654d151e34dbf187798d1547e7eb2b019774656ee963d4e71f0cf86143881240202dbdb52781f90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9c436f5740cfec33134e41814247783907712477371c168380edf39c7fddfee",
-        "network" : "Homestead",
+        "lastblockhash" : "0x69553558eae0c634c78c94895be149b1b6d81db1e0eb972a795ec2c75edf21e2",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_20500_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_37111_20500_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/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x010d2c",
-                    "hash" : "0xa995d0d5c55008718138b8c64ae012551905e2f86d0cf4381f4001ead013822c",
-                    "mixHash" : "0xa657f343588edb14051251885c1acbe903b8e7d8e38fe6d4ac94575c04ff9b4e",
-                    "nonce" : "0xf1e038f409ac4d83",
+                    "hash" : "0x7addb6f43f4936e9c85481c24d8ca89dfcc6bf619748c3d25b8dc416f60f01e7",
+                    "mixHash" : "0x5c5056468c3ab6a1269a8f8c42dd958bc25acee481cad4d9400452b485db404f",
+                    "nonce" : "0x584ebd466dc81e8e",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19",
-                    "stateRoot" : "0xdd2af41dd4ee2b8f85cf443dc304c7dbe3d3c5eb3f8ea163b082548a80f07e2e",
+                    "receiptTrie" : "0x00e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3",
+                    "stateRoot" : "0xe22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dd2af41dd4ee2b8f85cf443dc304c7dbe3d3c5eb3f8ea163b082548a80f07e2ea05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a0584dc39cc3eb9e978c112eb463b0249860447f592df4581113cc4b827e116a19b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a0a657f343588edb14051251885c1acbe903b8e7d8e38fe6d4ac94575c04ff9b4e88f1e038f409ac4d83f90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a05c5056468c3ab6a1269a8f8c42dd958bc25acee481cad4d9400452b485db404f88584ebd466dc81e8ef90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa995d0d5c55008718138b8c64ae012551905e2f86d0cf4381f4001ead013822c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7addb6f43f4936e9c85481c24d8ca89dfcc6bf619748c3d25b8dc416f60f01e7",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f71026",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760efda",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_37111_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x010d2c",
+                    "hash" : "0x68dc9ad8cda1afcd0117c3aab5eb44f8972b9c6edcad8832e4c377e96aed8f08",
+                    "mixHash" : "0xf6558389a51547ff1ab262c1849364d23e5372afba27c5dde4d2708397098df3",
+                    "nonce" : "0xfa1cbcec7c118f12",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x00e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3",
+                    "stateRoot" : "0xe22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0e22700070d5b45efc14044e19b0253ec642aa2abc0a125a8d2b0753869fbcbb6a05d695b82c2293bc95155a9383ac63d3bb204745522cd3b95895b6a53b1630e85a000e2e49195e2612faaf30eee893db53e5b2fde4113c3cf61ddccc5642fa1e0a3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083010d2c8203e880a0f6558389a51547ff1ab262c1849364d23e5372afba27c5dde4d2708397098df388fa1cbcec7c118f12f90289f90286010183010d2c94c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4a00cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x010d2c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa89a1097b95ed9185db3451caa6a892dab43aab9cc7871f38b6790f2dad5dec4",
+                        "s" : "0x0cccee7d25bba2bf33a623549904c7aa9ab091e7c74829911b25cb7795d1f7a4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x68dc9ad8cda1afcd0117c3aab5eb44f8972b9c6edcad8832e4c377e96aed8f08",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json
index 7b57aac97..8a14b46b1 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_37111_22000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_37111_22000_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/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011306",
-                    "hash" : "0xf5f5a6affb2dd4d8189a29ff73bbdd42aea2c8c03ffd786a1c6cbd6195b332e5",
-                    "mixHash" : "0xfcd64bf4cc6cb7056a334923e10f374eeffcff494fd47af3414909d3ac620c16",
-                    "nonce" : "0xc654b927720592c0",
+                    "gasUsed" : "0x011308",
+                    "hash" : "0x783ad02ee088565dd34f02db176309ea9aa402e63c524767efae3656e6287020",
+                    "mixHash" : "0x7f365ba65a10ca59f9c6743832427b837e1c7b3009d30d04ed3df6a8b64045b3",
+                    "nonce" : "0x5fb30505cf35bdf6",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
-                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
+                    "receiptTrie" : "0x19721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414b",
+                    "stateRoot" : "0x56ec4a6390cc5ed7001eab66031f32bd0b8ac4aa8694b4e823d05dd2f0fdff57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0fcd64bf4cc6cb7056a334923e10f374eeffcff494fd47af3414909d3ac620c1688c654b927720592c0f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056ec4a6390cc5ed7001eab66031f32bd0b8ac4aa8694b4e823d05dd2f0fdff57a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da019721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a07f365ba65a10ca59f9c6743832427b837e1c7b3009d30d04ed3df6a8b64045b3885fb30505cf35bdf6f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5f5a6affb2dd4d8189a29ff73bbdd42aea2c8c03ffd786a1c6cbd6195b332e5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x783ad02ee088565dd34f02db176309ea9aa402e63c524767efae3656e6287020",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f71600",
+                "balance" : "0x4563918244f71602",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ea00",
+                "balance" : "0x0de0b6b3a760e9fe",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_37111_22000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_37111_22000_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/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x011308",
+                    "hash" : "0xaf9bc0b665e1f5f5f052270655ff74c183676b48941b625858bd6d211f2099be",
+                    "mixHash" : "0x309e487032530134646fd95f2ce37e25754ca22c0037c4956a8b685545df7593",
+                    "nonce" : "0xdf5fce644002bd8d",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x19721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414b",
+                    "stateRoot" : "0x56ec4a6390cc5ed7001eab66031f32bd0b8ac4aa8694b4e823d05dd2f0fdff57",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056ec4a6390cc5ed7001eab66031f32bd0b8ac4aa8694b4e823d05dd2f0fdff57a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da019721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a0309e487032530134646fd95f2ce37e25754ca22c0037c4956a8b685545df759388df5fce644002bd8df90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x011308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xcee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbaf",
+                        "s" : "0x148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaf9bc0b665e1f5f5f052270655ff74c183676b48941b625858bd6d211f2099be",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f71602",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760e9fe",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_37111_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011306",
-                    "hash" : "0x4544fe0aef5fe157fe9669a0ddcd74dd5f11294503fb6fcdfa64acfb8ba2aa91",
-                    "mixHash" : "0x7373b086514e46e35b711b04c2e93bf05ebe30f09b10283313aabcd33f056f6e",
-                    "nonce" : "0x0aef7c090918d611",
+                    "hash" : "0x918c702221dcc6efbe1b9ec3e02d638f5a0cebd8b6a433b1102fab36099bf52c",
+                    "mixHash" : "0x81cd27a3cceb9c23a76dff3fae9f6d964c1f5af35d35f707cd250956bbaf9c61",
+                    "nonce" : "0x4236bef7aef54c41",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a07373b086514e46e35b711b04c2e93bf05ebe30f09b10283313aabcd33f056f6e880aef7c090918d611f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a081cd27a3cceb9c23a76dff3fae9f6d964c1f5af35d35f707cd250956bbaf9c61884236bef7aef54c41f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4544fe0aef5fe157fe9669a0ddcd74dd5f11294503fb6fcdfa64acfb8ba2aa91",
-        "network" : "EIP158",
+        "lastblockhash" : "0x918c702221dcc6efbe1b9ec3e02d638f5a0cebd8b6a433b1102fab36099bf52c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_22000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_37111_22000_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/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011308",
-                    "hash" : "0x651ae9ad87ef3a17e347cd37359123a6e10e0a500e958288740c2ca3691025a5",
-                    "mixHash" : "0x7e57769cbe61e826a7ce4dd86433104a2f425d5731eddea76423d73eace1d0ab",
-                    "nonce" : "0x51f479a199f245cc",
+                    "gasUsed" : "0x011306",
+                    "hash" : "0x492e5ad635111b6a25800b9631ea9e96206e40f7848ab5b186f5a72b02ef0a45",
+                    "mixHash" : "0x6cfa6254475dafd70f6f0a28b96c96cf8961f106e8125750f03e2302f5b73a3e",
+                    "nonce" : "0x3471f3be67e20939",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x73749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16d",
-                    "stateRoot" : "0x73f3cc4feaf49c9f08f1cdd7548f7dfb844996a2bb8b8673b91287c5ab5dccda",
+                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
+                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073f3cc4feaf49c9f08f1cdd7548f7dfb844996a2bb8b8673b91287c5ab5dccdaa01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da073749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a07e57769cbe61e826a7ce4dd86433104a2f425d5731eddea76423d73eace1d0ab8851f479a199f245ccf90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a06cfa6254475dafd70f6f0a28b96c96cf8961f106e8125750f03e2302f5b73a3e883471f3be67e20939f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x651ae9ad87ef3a17e347cd37359123a6e10e0a500e958288740c2ca3691025a5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x492e5ad635111b6a25800b9631ea9e96206e40f7848ab5b186f5a72b02ef0a45",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f71602",
+                "balance" : "0x4563918244f71600",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760e9fe",
+                "balance" : "0x0de0b6b3a760ea00",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_22000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_37111_22000_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/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011308",
-                    "hash" : "0xcc55cb9411d6efa329ec47bf6ebd6c67a804ecaa85096d9dd6ca62a9fd5943c1",
-                    "mixHash" : "0x700530d29a944b2d341e05bdf75eeb77b0fde34dcd91fc4ebff4fea35fbf569f",
-                    "nonce" : "0x96cabfd9ca66540e",
+                    "hash" : "0x3c0a762b381396a955e8d6be72f018d1b57cac4198b196c5fddc3df1baa56fef",
+                    "mixHash" : "0xb854e37c49334d4124be15ac9b2a270428f63f0bd07b1a88117a4efa4749defe",
+                    "nonce" : "0xa8fcc843f26f34bb",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x73749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16d",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073f3cc4feaf49c9f08f1cdd7548f7dfb844996a2bb8b8673b91287c5ab5dccdaa01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da073749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a0700530d29a944b2d341e05bdf75eeb77b0fde34dcd91fc4ebff4fea35fbf569f8896cabfd9ca66540ef90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073f3cc4feaf49c9f08f1cdd7548f7dfb844996a2bb8b8673b91287c5ab5dccdaa01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da073749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a0b854e37c49334d4124be15ac9b2a270428f63f0bd07b1a88117a4efa4749defe88a8fcc843f26f34bbf90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc55cb9411d6efa329ec47bf6ebd6c67a804ecaa85096d9dd6ca62a9fd5943c1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3c0a762b381396a955e8d6be72f018d1b57cac4198b196c5fddc3df1baa56fef",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_22000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_37111_22000_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/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011308",
-                    "hash" : "0x9457bd5adfc7af9e6ea3ca2f5ca0d82e77a9e21200a7a5f9696bfc259b8a9f45",
-                    "mixHash" : "0xcaa79b2eeed46c32387953b1a6fe1c084f35c2e07b2e59b5afca5ad7dc0ab7a6",
-                    "nonce" : "0xf6893a6ca1e67fe3",
+                    "hash" : "0x5108390772666eea3bf81a0fb038d30403346832fb52f25fa6c5d16289ce0236",
+                    "mixHash" : "0x17cd21524f287972bb909e604ee9dd18f380d37621130df5e754b86e989a3d41",
+                    "nonce" : "0x94bff4179b3f2c53",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x19721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414b",
-                    "stateRoot" : "0x56ec4a6390cc5ed7001eab66031f32bd0b8ac4aa8694b4e823d05dd2f0fdff57",
+                    "receiptTrie" : "0x73749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16d",
+                    "stateRoot" : "0x73f3cc4feaf49c9f08f1cdd7548f7dfb844996a2bb8b8673b91287c5ab5dccda",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056ec4a6390cc5ed7001eab66031f32bd0b8ac4aa8694b4e823d05dd2f0fdff57a01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da019721db51cc1fbb3e18b8d8804d370b9197e655e5e9120df6ae77f498a77414bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a0caa79b2eeed46c32387953b1a6fe1c084f35c2e07b2e59b5afca5ad7dc0ab7a688f6893a6ca1e67fe3f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073f3cc4feaf49c9f08f1cdd7548f7dfb844996a2bb8b8673b91287c5ab5dccdaa01dcdbfa9f26c81496c776c83f291fac314726f5a5fa808dc033a6c3ef58e9f8da073749ddcce9101ff0e40fdd7d7bf9fd6b8d840cbf85b79bdd5cae59b1065a16db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113088203e880a017cd21524f287972bb909e604ee9dd18f380d37621130df5e754b86e989a3d418894bff4179b3f2c53f90289f9028601018301130894c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0cee26fbff80dfd6dd55040cbf69a397b37cb119b390252aaa9fffaeb73f6cbafa0148acbcf4a2fceade8d26ba2a5878e5b3b2212b25964b3d1efe4dac46b3637a0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9457bd5adfc7af9e6ea3ca2f5ca0d82e77a9e21200a7a5f9696bfc259b8a9f45",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5108390772666eea3bf81a0fb038d30403346832fb52f25fa6c5d16289ce0236",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f71602",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json
index c809edcbc..ce265e3cd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_37111_25000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_37111_25000_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/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011306",
-                    "hash" : "0x24f3a16c189a1b3aab19b4e8bee2c4a7eda956d22e5a231f2613ec1138df1dda",
-                    "mixHash" : "0x3e962f8f6023dd0b42854d0b5d3bde493f3d699d5ca5c3ed755721359b5ac8f4",
-                    "nonce" : "0x5d0c6a418fa847ce",
+                    "gasUsed" : "0x011ec0",
+                    "hash" : "0x64feb8cb854045b8515aaab84295309a546024cd37a9546f7ee75e58a27decd4",
+                    "mixHash" : "0xd3c8aad0d45141e05e092874a3a7e5e0952c0953bd78da17a3ebed0f2924102a",
+                    "nonce" : "0x8f9352cfd84f592d",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
-                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
+                    "receiptTrie" : "0x8de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74",
+                    "stateRoot" : "0x8fb4f4dd8aa1bc4a2bc80a0f8411f55f8bd6f97d4f1bb2a5f662b01d0c31ce26",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a03e962f8f6023dd0b42854d0b5d3bde493f3d699d5ca5c3ed755721359b5ac8f4885d0c6a418fa847cef90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08fb4f4dd8aa1bc4a2bc80a0f8411f55f8bd6f97d4f1bb2a5f662b01d0c31ce26a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca08de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a0d3c8aad0d45141e05e092874a3a7e5e0952c0953bd78da17a3ebed0f2924102a888f9352cfd84f592df90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24f3a16c189a1b3aab19b4e8bee2c4a7eda956d22e5a231f2613ec1138df1dda",
-        "network" : "EIP150",
+        "lastblockhash" : "0x64feb8cb854045b8515aaab84295309a546024cd37a9546f7ee75e58a27decd4",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f71600",
+                "balance" : "0x4563918244f721ba",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ea00",
+                "balance" : "0x0de0b6b3a760de46",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_37111_25000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_37111_25000_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/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x011ec0",
+                    "hash" : "0x4a3120393b70a806317bf911112b2e9ce8b9f361e9c395586b50010c5efd788d",
+                    "mixHash" : "0x7e0655a6a480a986bd8dfe61b2a8fb2537ed78b3fc485c3bfee3954ea8ac274d",
+                    "nonce" : "0xaee6b89dc18a0da5",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x8de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74",
+                    "stateRoot" : "0x8fb4f4dd8aa1bc4a2bc80a0f8411f55f8bd6f97d4f1bb2a5f662b01d0c31ce26",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08fb4f4dd8aa1bc4a2bc80a0f8411f55f8bd6f97d4f1bb2a5f662b01d0c31ce26a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca08de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a07e0655a6a480a986bd8dfe61b2a8fb2537ed78b3fc485c3bfee3954ea8ac274d88aee6b89dc18a0da5f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x011ec0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975c",
+                        "s" : "0x733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4a3120393b70a806317bf911112b2e9ce8b9f361e9c395586b50010c5efd788d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f721ba",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760de46",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_37111_25000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011306",
-                    "hash" : "0xaf049240eb9f8cd499142d9a5c991cadf98137a46b264313860e42679bc312f0",
-                    "mixHash" : "0x97cadceda6cc47aa6fabddd93aaec46220546470168d02e8a5b1a6f312aff331",
-                    "nonce" : "0x00f36df48d7b120e",
+                    "hash" : "0xa0db2b631610cb9557c6c9af2c765011041a3394a411b076334502c1c0512acd",
+                    "mixHash" : "0xc155f2273cd6330e8b9c41a963a8e26d9d56761a8bce8395a0b9bca2a07a1e8b",
+                    "nonce" : "0xeb778956f38c79a7",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a097cadceda6cc47aa6fabddd93aaec46220546470168d02e8a5b1a6f312aff3318800f36df48d7b120ef90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0c155f2273cd6330e8b9c41a963a8e26d9d56761a8bce8395a0b9bca2a07a1e8b88eb778956f38c79a7f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf049240eb9f8cd499142d9a5c991cadf98137a46b264313860e42679bc312f0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa0db2b631610cb9557c6c9af2c765011041a3394a411b076334502c1c0512acd",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_25000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_37111_25000_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/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011ec0",
-                    "hash" : "0x94cd8ffe68fd0aceecb64d3e92086e61ce0b7f49f40b7eeb421f64a10584c0ae",
-                    "mixHash" : "0xafbcd59832705f13a37333f434f026c672f2abaa3e1df0f3550dba69dd357b86",
-                    "nonce" : "0x4e9766d68169f3d9",
+                    "gasUsed" : "0x011306",
+                    "hash" : "0x4218d7788121c2c944be95a1ed2997e20696abff53fc31472792864b9fcfe7d2",
+                    "mixHash" : "0x654b7a8c195ee2dc464d237ac4dee2b0184ce31f78d0b32ba648b51db5f520f6",
+                    "nonce" : "0x10345d7146fffba0",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x6547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328",
-                    "stateRoot" : "0x436415ecdc2f00fdcffc364e356fc52faf6d62e302d01b9f08132eb3aeb2fa8c",
+                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
+                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0436415ecdc2f00fdcffc364e356fc52faf6d62e302d01b9f08132eb3aeb2fa8ca08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca06547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a0afbcd59832705f13a37333f434f026c672f2abaa3e1df0f3550dba69dd357b86884e9766d68169f3d9f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0654b7a8c195ee2dc464d237ac4dee2b0184ce31f78d0b32ba648b51db5f520f68810345d7146fffba0f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94cd8ffe68fd0aceecb64d3e92086e61ce0b7f49f40b7eeb421f64a10584c0ae",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4218d7788121c2c944be95a1ed2997e20696abff53fc31472792864b9fcfe7d2",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f721ba",
+                "balance" : "0x4563918244f71600",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760de46",
+                "balance" : "0x0de0b6b3a760ea00",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_25000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_37111_25000_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/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011ec0",
-                    "hash" : "0x2e72c1bda90ae7bfba0756fcd1517a7fdb8c28e09827cd2cc95a91813273f178",
-                    "mixHash" : "0x2a9e5ecee628e77ca25be226a8ff414f360a168957e8bf128c92c4b7ba26d853",
-                    "nonce" : "0x3252eac3858c7b64",
+                    "hash" : "0x92660210152d3793af2660a63d253346255c4a53b8c938d31e1cdcabc686966e",
+                    "mixHash" : "0xee747d74192b3f644ef9c576b467ecf8fd42b2f42035a37ebb5e91d0022cd12b",
+                    "nonce" : "0x0de775ecaba46b6b",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x6547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0436415ecdc2f00fdcffc364e356fc52faf6d62e302d01b9f08132eb3aeb2fa8ca08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca06547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a02a9e5ecee628e77ca25be226a8ff414f360a168957e8bf128c92c4b7ba26d853883252eac3858c7b64f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0436415ecdc2f00fdcffc364e356fc52faf6d62e302d01b9f08132eb3aeb2fa8ca08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca06547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a0ee747d74192b3f644ef9c576b467ecf8fd42b2f42035a37ebb5e91d0022cd12b880de775ecaba46b6bf90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e72c1bda90ae7bfba0756fcd1517a7fdb8c28e09827cd2cc95a91813273f178",
-        "network" : "Homestead",
+        "lastblockhash" : "0x92660210152d3793af2660a63d253346255c4a53b8c938d31e1cdcabc686966e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_25000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_37111_25000_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/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011ec0",
-                    "hash" : "0x3ceda4849fee4e11bb679c6f936347be426ffddd863793eec8a7f3d935cbc08c",
-                    "mixHash" : "0x8158b29eb9216d46d6f66f9d0e20ac8c0b6e7f5476ab66371b59f201702c4f65",
-                    "nonce" : "0x2071fa506b2b9926",
+                    "hash" : "0xc5ad348203b22cf64bce89594e129e9201b1dc822571ba709b1308e70317134b",
+                    "mixHash" : "0x11ca4317ebb78e2672b8f29a180021fbff7e8c4783167810e5435458f97ab994",
+                    "nonce" : "0xaec1fc9bd6c5ba90",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x8de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74",
-                    "stateRoot" : "0x8fb4f4dd8aa1bc4a2bc80a0f8411f55f8bd6f97d4f1bb2a5f662b01d0c31ce26",
+                    "receiptTrie" : "0x6547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328",
+                    "stateRoot" : "0x436415ecdc2f00fdcffc364e356fc52faf6d62e302d01b9f08132eb3aeb2fa8c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08fb4f4dd8aa1bc4a2bc80a0f8411f55f8bd6f97d4f1bb2a5f662b01d0c31ce26a08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca08de6a10b876d82ccce671adbc904f813b7cd0121c756d5bc4aae0d677ad51f74b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a08158b29eb9216d46d6f66f9d0e20ac8c0b6e7f5476ab66371b59f201702c4f65882071fa506b2b9926f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0436415ecdc2f00fdcffc364e356fc52faf6d62e302d01b9f08132eb3aeb2fa8ca08ce8f0903ad438aee5d32d7f8a315b81298a1791fb2a742b2121cbafdd0a208ca06547a5b447d15e87e42a52dbc965913ed023639808c64b9bdb605e5ad73f4328b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011ec08203e880a011ca4317ebb78e2672b8f29a180021fbff7e8c4783167810e5435458f97ab99488aec1fc9bd6c5ba90f90289f90286010183011ec094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ba0a02366a8fea72efd0021085e56567e1d2f7743bb1437bd255445bf33811f975ca0733ce76fb600aff70df6f3162862969a01029d2b6c84fb6d17f97289d24c741ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ceda4849fee4e11bb679c6f936347be426ffddd863793eec8a7f3d935cbc08c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc5ad348203b22cf64bce89594e129e9201b1dc822571ba709b1308e70317134b",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f721ba",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json
index c0c32b65d..11fbe6b36 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_37111_35000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_37111_35000_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/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011306",
-                    "hash" : "0x651a7d59fd490fa232e690b076199e5acbd9494ce956fa96b3803f7c195a469f",
-                    "mixHash" : "0xd10b0d6523b27c3334f1b8da043c4fa1c31993087c4b8717468bc381a65a7c45",
-                    "nonce" : "0x3a575f26efc53673",
+                    "gasUsed" : "0x0145d0",
+                    "hash" : "0x252e89fb47ebc1e1010a805ee2cad2712149fdae1f16faed0d28e8946b9e0051",
+                    "mixHash" : "0x01f90d56fa9e8129c0d085142de421701f7a09115f4c42be5e302d1c8dc66d4b",
+                    "nonce" : "0xcdfe6b30f1f99348",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
-                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
+                    "receiptTrie" : "0x91336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055",
+                    "stateRoot" : "0x1c993492a04f989187d1abdefc1f9acfdcb26c8325e718723a2d5142deac8958",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0d10b0d6523b27c3334f1b8da043c4fa1c31993087c4b8717468bc381a65a7c45883a575f26efc53673f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c993492a04f989187d1abdefc1f9acfdcb26c8325e718723a2d5142deac8958a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a091336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a001f90d56fa9e8129c0d085142de421701f7a09115f4c42be5e302d1c8dc66d4b88cdfe6b30f1f99348f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x651a7d59fd490fa232e690b076199e5acbd9494ce956fa96b3803f7c195a469f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x252e89fb47ebc1e1010a805ee2cad2712149fdae1f16faed0d28e8946b9e0051",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f71600",
+                "balance" : "0x4563918244f748ca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ea00",
+                "balance" : "0x0de0b6b3a760b736",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_37111_35000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_37111_35000_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/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x0145d0",
+                    "hash" : "0x463df890c6a9d892626a5e3dbb3f947ad10a47381a0a8e66665378db8705b6a4",
+                    "mixHash" : "0x71de32573eef56c26b3092fcb66915a6b2be9ab6555218f09ac8fbb85c69e9fe",
+                    "nonce" : "0xa7227b395ca847c2",
+                    "number" : "0x01",
+                    "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+                    "receiptTrie" : "0x91336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055",
+                    "stateRoot" : "0x1c993492a04f989187d1abdefc1f9acfdcb26c8325e718723a2d5142deac8958",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c993492a04f989187d1abdefc1f9acfdcb26c8325e718723a2d5142deac8958a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a091336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a071de32573eef56c26b3092fcb66915a6b2be9ab6555218f09ac8fbb85c69e9fe88a7227b395ca847c2f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
+                        "gasLimit" : "0x0145d0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5",
+                        "s" : "0x1adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x463df890c6a9d892626a5e3dbb3f947ad10a47381a0a8e66665378db8705b6a4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f748ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760b736",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_37111_35000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011306",
-                    "hash" : "0xf0ecc3fc7390a9fe390b945c75e6ceafa2ae49a030bd413e33e23fddeac2b8de",
-                    "mixHash" : "0x33f90beaa4abd544213b637c1fc5a92ffec9c555e9722878148e2085216bd754",
-                    "nonce" : "0xbfcfcc96fb1c1ec4",
+                    "hash" : "0x1b3f7a979e338eba8f276677e44ba297168424b6ce330a4425942cdf5b588366",
+                    "mixHash" : "0xe457fa0e71d8728acc90b53d83fc6a858798216f95601c3d9dc0f212303f02e6",
+                    "nonce" : "0xa04e69a8ff977960",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a033f90beaa4abd544213b637c1fc5a92ffec9c555e9722878148e2085216bd75488bfcfcc96fb1c1ec4f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a0e457fa0e71d8728acc90b53d83fc6a858798216f95601c3d9dc0f212303f02e688a04e69a8ff977960f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0ecc3fc7390a9fe390b945c75e6ceafa2ae49a030bd413e33e23fddeac2b8de",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1b3f7a979e338eba8f276677e44ba297168424b6ce330a4425942cdf5b588366",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_35000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_37111_35000_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/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0145d0",
-                    "hash" : "0x152c7a5997ff5673e5950bd96600b03199eb0b53152b5ab7c551fe58753e930c",
-                    "mixHash" : "0xb96154ee086aa18d5a4402669adf146f24b919c5c7627fa9a25e138a788efd64",
-                    "nonce" : "0x2bc701c71b1ad9ba",
+                    "gasUsed" : "0x011306",
+                    "hash" : "0x537348009c74d14454b5c74eda4c0481dab13b9934929b3dd22661725236ba77",
+                    "mixHash" : "0x5c18fa0ca2165afadde318b40aa47577a91f0d6594c246fb272c08594d6e04e6",
+                    "nonce" : "0x076a974e3a525853",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x0c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957d",
-                    "stateRoot" : "0x1a985e30cb358570685e815a6b75859752636159cf286f4160d6338da7338d8d",
+                    "receiptTrie" : "0x9af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906",
+                    "stateRoot" : "0x556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a985e30cb358570685e815a6b75859752636159cf286f4160d6338da7338d8da009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a00c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a0b96154ee086aa18d5a4402669adf146f24b919c5c7627fa9a25e138a788efd64882bc701c71b1ad9baf90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0556b528c8695101db4bb54cc8fce29e959e130b44d6968fc119b98f408391288a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a09af93b8400957b78e28a2e16f0a889f74374861961485aee6baa3e8fb1cfc906b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830113068203e880a05c18fa0ca2165afadde318b40aa47577a91f0d6594c246fb272c08594d6e04e688076a974e3a525853f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x152c7a5997ff5673e5950bd96600b03199eb0b53152b5ab7c551fe58753e930c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x537348009c74d14454b5c74eda4c0481dab13b9934929b3dd22661725236ba77",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f748ca",
+                "balance" : "0x4563918244f71600",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760b736",
+                "balance" : "0x0de0b6b3a760ea00",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_35000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_37111_35000_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/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0145d0",
-                    "hash" : "0x08bcb0452830ce58cd8f4d2586335a38cbee3537d314cce7077f63ef3a1260aa",
-                    "mixHash" : "0x455ef549009754aa2ff0d16db6cb897e50b4933da42de70487bcd5ba3f23a6b5",
-                    "nonce" : "0x8492924eec98a0a2",
+                    "hash" : "0x36eab0740c9d753c215c2ebbbebc70bc89c22f0c5223f3c3b9ad8eff684ba4ed",
+                    "mixHash" : "0x9cd9f0da95527d6764601b28e6e694bd7e668bb456159d89aee82225c8a770d9",
+                    "nonce" : "0x16129f173e464297",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
                     "receiptTrie" : "0x0c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957d",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a985e30cb358570685e815a6b75859752636159cf286f4160d6338da7338d8da009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a00c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a0455ef549009754aa2ff0d16db6cb897e50b4933da42de70487bcd5ba3f23a6b5888492924eec98a0a2f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a985e30cb358570685e815a6b75859752636159cf286f4160d6338da7338d8da009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a00c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a09cd9f0da95527d6764601b28e6e694bd7e668bb456159d89aee82225c8a770d98816129f173e464297f90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08bcb0452830ce58cd8f4d2586335a38cbee3537d314cce7077f63ef3a1260aa",
-        "network" : "Homestead",
+        "lastblockhash" : "0x36eab0740c9d753c215c2ebbbebc70bc89c22f0c5223f3c3b9ad8eff684ba4ed",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_37111_35000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_37111_35000_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/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0145d0",
-                    "hash" : "0xef8f035073d1c583d8ea519408ac0834d544ebb5f06af08e0dcadafb9e846271",
-                    "mixHash" : "0x7a9dfe2a4c7e03edb0dc1f7ac9f5133bb4548f50e1d24be9880967f2e4eafccf",
-                    "nonce" : "0xb8e280b230eb504b",
+                    "hash" : "0x36f99584b49b8d467870cf1eea94727365ff8ff33540ab6d7d51c0456ff723e3",
+                    "mixHash" : "0x72da4c5d7037813afbb86aec73fdb7691954da15a422ea42cff986e6d5ab0c81",
+                    "nonce" : "0x8687f6caa2fe3dbc",
                     "number" : "0x01",
                     "parentHash" : "0xa329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555",
-                    "receiptTrie" : "0x91336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055",
-                    "stateRoot" : "0x1c993492a04f989187d1abdefc1f9acfdcb26c8325e718723a2d5142deac8958",
+                    "receiptTrie" : "0x0c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957d",
+                    "stateRoot" : "0x1a985e30cb358570685e815a6b75859752636159cf286f4160d6338da7338d8d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c993492a04f989187d1abdefc1f9acfdcb26c8325e718723a2d5142deac8958a009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a091336e88fa620cb6126a4b36c4485cb8570acbf096cd4a8e29dc258399637055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a07a9dfe2a4c7e03edb0dc1f7ac9f5133bb4548f50e1d24be9880967f2e4eafccf88b8e280b230eb504bf90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
+                "rlp" : "0xf90489f901f9a0a329cc1e3320c297ed760e741d094df720e054640e41014bdaa137ab8f0af555a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a985e30cb358570685e815a6b75859752636159cf286f4160d6338da7338d8da009c46ee641f6783d82b0a3b9f17cf485311575ddfa0986f7d7d78b30456b5701a00c441fd58b6d31c64526b0de7b4b9f0aa226d3b8ff49a4c8624107ec3045957db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830145d08203e880a072da4c5d7037813afbb86aec73fdb7691954da15a422ea42cff986e6d5ab0c81888687f6caa2fe3dbcf90289f902860101830145d094c305c901078781c232a2a521c2af7980f8385ee980b9022430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff971ca00c149b0991c40da090b4b89ea3c4b0156842abc0cfab139e852b86a9f07342c5a01adcd8e6273529cea4b2e471a92a8188ebeab5b294446426023772b4709a332bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04ec1cec678ac59f654001236e7755a1ee17d23482e4552bdfa5b6966cc3ecdc8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef8f035073d1c583d8ea519408ac0834d544ebb5f06af08e0dcadafb9e846271",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x36f99584b49b8d467870cf1eea94727365ff8ff33540ab6d7d51c0456ff723e3",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f748ca",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json
index 3a7dfa682..9d2a41019 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_97_1000000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_97_1000000_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/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0xa63e8d5a7d4cc514d51adce92cf948b873285c79ecf9a0c7ca02d1e62e888e1b",
-                    "mixHash" : "0x33366a1c2c4bdc5353a735c2ce6fd555dd90313c1144a10c3167f443b063b732",
-                    "nonce" : "0xbbd6baeef91f8a9f",
+                    "gasUsed" : "0x030577",
+                    "hash" : "0x616bc76c10d92096db3744cecb62dbcc959e5b1cea63b4421dea70d2daa04b85",
+                    "mixHash" : "0x3d24a3954929ebbb0dcf40a741a8d3e2a0371c827e65ed43111a2ab7913bdec9",
+                    "nonce" : "0xcd3da922c183c962",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0xce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6",
+                    "stateRoot" : "0x5486477e512c9e841cf2517c15b910e68449f75f01dbcecfa94450ca71aa031d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a033366a1c2c4bdc5353a735c2ce6fd555dd90313c1144a10c3167f443b063b73288bbd6baeef91f8a9ff90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05486477e512c9e841cf2517c15b910e68449f75f01dbcecfa94450ca71aa031da00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a0ce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305778203e880a03d24a3954929ebbb0dcf40a741a8d3e2a0371c827e65ed43111a2ab7913bdec988cd3da922c183c962f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa63e8d5a7d4cc514d51adce92cf948b873285c79ecf9a0c7ca02d1e62e888e1b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x616bc76c10d92096db3744cecb62dbcc959e5b1cea63b4421dea70d2daa04b85",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f90871",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a75ef78f",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                    "0x00" : "0xeff31f7855752a3582db9a0d965d5063f23d94003e66f8c5a8f8e8fe2ab24753"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_37120_37111_97_1000000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_97_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x030577",
+                    "hash" : "0x7c3f147b4154ce5a925a4243392bce5da0949b3ca432edd40679f56d938b83ae",
+                    "mixHash" : "0xb908e0d61d8f424ce8b6c0b5d51c22431d726b6c3adf2f97578854b80f0ca24f",
+                    "nonce" : "0xb24651e058702229",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6",
+                    "stateRoot" : "0x5486477e512c9e841cf2517c15b910e68449f75f01dbcecfa94450ca71aa031d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05486477e512c9e841cf2517c15b910e68449f75f01dbcecfa94450ca71aa031da00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a0ce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305778203e880a0b908e0d61d8f424ce8b6c0b5d51c22431d726b6c3adf2f97578854b80f0ca24f88b24651e058702229f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0fde18",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xb3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8e",
+                        "s" : "0x47dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7c3f147b4154ce5a925a4243392bce5da0949b3ca432edd40679f56d938b83ae",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f90871",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75ef78f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xeff31f7855752a3582db9a0d965d5063f23d94003e66f8c5a8f8e8fe2ab24753"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_97_1000000_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/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0xddabde900a5a693887972691cd1a09473c9fa4953ea9ad066231bdb209d0bb7c",
-                    "mixHash" : "0xed51c3fdbc330ff000d8a7c578344826755d431e7649910d7674240e111f5e8b",
-                    "nonce" : "0x2162926aab789558",
+                    "hash" : "0x2a0bd5a12b9545f298251fe1234a07e2f15b70ea094a41868ab86f1554a36f74",
+                    "mixHash" : "0x1b4266b0b161a2a06eaf559902c8c7f5b3eadda6ac2cc5b167a2f8325cab65d7",
+                    "nonce" : "0x307c1a02240e689d",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0ed51c3fdbc330ff000d8a7c578344826755d431e7649910d7674240e111f5e8b882162926aab789558f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a01b4266b0b161a2a06eaf559902c8c7f5b3eadda6ac2cc5b167a2f8325cab65d788307c1a02240e689df90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xddabde900a5a693887972691cd1a09473c9fa4953ea9ad066231bdb209d0bb7c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2a0bd5a12b9545f298251fe1234a07e2f15b70ea094a41868ab86f1554a36f74",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_1000000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_97_1000000_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/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0fde18",
-                    "hash" : "0x685f04f247c8c5b9f4cb87e5b2037823d07cdae1411cc21a5916ef0d16218f82",
-                    "mixHash" : "0x42a45e346cbd1ab03707bfc36d12a21f1325f9edc8800ea229159cf7a8593a9e",
-                    "nonce" : "0x96c025f530c6257e",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x9ddcb922675a56f49c29ddc0cc80a7f3e40d46d1ad02210656bda2158ed7b8a5",
+                    "mixHash" : "0xd56f4601c5e56ce19d1b0c01a39764eb1b4d62a433af1a6cb8d4362791268e3a",
+                    "nonce" : "0xfbe9d465d5096b7b",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x81888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22",
-                    "stateRoot" : "0x33e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9be",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a042a45e346cbd1ab03707bfc36d12a21f1325f9edc8800ea229159cf7a8593a9e8896c025f530c6257ef90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0d56f4601c5e56ce19d1b0c01a39764eb1b4d62a433af1a6cb8d4362791268e3a88fbe9d465d5096b7bf90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x685f04f247c8c5b9f4cb87e5b2037823d07cdae1411cc21a5916ef0d16218f82",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9ddcb922675a56f49c29ddc0cc80a7f3e40d46d1ad02210656bda2158ed7b8a5",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x456391824505e112",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7521eee",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_1000000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_97_1000000_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/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0fde18",
-                    "hash" : "0x87681eea1ec99f9c1e979a50ab8ddf9f7bf7b1898a2ce75c3c09f7ba7514d26d",
-                    "mixHash" : "0x84e9df7168c14a2e220d0ce7feb591362d7d7e0daa914442064693832fd9a60f",
-                    "nonce" : "0x92e1aa1345057de7",
+                    "hash" : "0x3e136164155d524fdbf82687b9b709a3440961a3f477bd9d9e5703d6f3f19c8b",
+                    "mixHash" : "0x0b35ec6d4c3bd56ffbd5cc86c6bf7f4e495fb44e3b18592e2262a1a2e16f2898",
+                    "nonce" : "0xbe41d5853588c934",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x81888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a084e9df7168c14a2e220d0ce7feb591362d7d7e0daa914442064693832fd9a60f8892e1aa1345057de7f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a00b35ec6d4c3bd56ffbd5cc86c6bf7f4e495fb44e3b18592e2262a1a2e16f289888be41d5853588c934f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87681eea1ec99f9c1e979a50ab8ddf9f7bf7b1898a2ce75c3c09f7ba7514d26d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3e136164155d524fdbf82687b9b709a3440961a3f477bd9d9e5703d6f3f19c8b",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_1000000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_97_1000000_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/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x030577",
-                    "hash" : "0x65c1e029c96b3a428eedead51c09318c80ceb856e5509c32812bbaa93c9bf9e2",
-                    "mixHash" : "0x2a005da5ce62fde589cc253c73826d95ac36d444430a6ff61611b3ecdcf68bf9",
-                    "nonce" : "0x5ff5d4515a369916",
+                    "gasUsed" : "0x0fde18",
+                    "hash" : "0x5cdeee246753746bfa8ce07a84016a33c348326fe4e3999150cc9ae92c3852b6",
+                    "mixHash" : "0x5dc5cc9355953a4d848812630a835d260932dd61c9981637a5cb7578264ff529",
+                    "nonce" : "0x2e99b2676dd8ebad",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6",
-                    "stateRoot" : "0x5486477e512c9e841cf2517c15b910e68449f75f01dbcecfa94450ca71aa031d",
+                    "receiptTrie" : "0x81888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22",
+                    "stateRoot" : "0x33e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9be",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05486477e512c9e841cf2517c15b910e68449f75f01dbcecfa94450ca71aa031da00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a0ce251df4fc45d81b3455395049be8ee7a3f09b5f6ae007729b22d2a7a2172ab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305778203e880a02a005da5ce62fde589cc253c73826d95ac36d444430a6ff61611b3ecdcf68bf9885ff5d4515a369916f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033e12baa6c42f557f04256ada457911ee818325c68d24d1cfc9f95284fc5c9bea00473c2eed4153f1f6c196d2e760f6d472f895e21ab712504e08d72235b386239a081888cc4e38741d740fc49dc617bce56a8d66e02c7241fc2e4e127ea1c1dab22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a05dc5cc9355953a4d848812630a835d260932dd61c9981637a5cb7578264ff529882e99b2676dd8ebadf90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba0b3421af5ac0a371641af72ae2314eb8b201685140756659c4075f4b17168ad8ea047dbd6cab269beddc5fb3e96157859ac9be4cb1902c5d08c74de795143cbd389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65c1e029c96b3a428eedead51c09318c80ceb856e5509c32812bbaa93c9bf9e2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5cdeee246753746bfa8ce07a84016a33c348326fe4e3999150cc9ae92c3852b6",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f90871",
+                "balance" : "0x456391824505e112",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75ef78f",
+                "balance" : "0x0de0b6b3a7521eee",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xeff31f7855752a3582db9a0d965d5063f23d94003e66f8c5a8f8e8fe2ab24753"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json
index eb2be58d2..c2e19061d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_97_155000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_97_155000_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/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0xb3dad8e141dab8ca16dc24e9c8d0bf014c6011097c8aa0de131f53402db3a0bb",
-                    "mixHash" : "0xf68c0c8627284bcb8efaf8d57f92deb28c87987108f9a6be9176bf386e821026",
-                    "nonce" : "0x1981355e6b3350fa",
+                    "gasUsed" : "0x02f950",
+                    "hash" : "0x4b367c0723ef5e26633120ffaa446a229a95d4f33e7cb9da091111de082606aa",
+                    "mixHash" : "0x8a2488fa4b337d0cd8e8cefa4e69b82b097b30db4a7aa016f6377fbc682e9375",
+                    "nonce" : "0xc954a2c7d2c93acc",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
+                    "stateRoot" : "0x1984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0f68c0c8627284bcb8efaf8d57f92deb28c87987108f9a6be9176bf386e821026881981355e6b3350faf90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a08a2488fa4b337d0cd8e8cefa4e69b82b097b30db4a7aa016f6377fbc682e937588c954a2c7d2c93accf90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3dad8e141dab8ca16dc24e9c8d0bf014c6011097c8aa0de131f53402db3a0bb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4b367c0723ef5e26633120ffaa446a229a95d4f33e7cb9da091111de082606aa",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f8fc4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a75f03b6",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_97_155000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_97_155000_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/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x02f950",
+                    "hash" : "0x92872c38c72ad62f7ee86c610b57f8ca5814dcc7f090cfc972b7929543f89180",
+                    "mixHash" : "0x035153eeec8eef575caf12d7224ec66b5c970e5d14018780af3d6fb221b93034",
+                    "nonce" : "0x8e09d1b977d8477d",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
+                    "stateRoot" : "0x1984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0035153eeec8eef575caf12d7224ec66b5c970e5d14018780af3d6fb221b93034888e09d1b977d8477df90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02f950",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6",
+                        "s" : "0x65d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x92872c38c72ad62f7ee86c610b57f8ca5814dcc7f090cfc972b7929543f89180",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f8fc4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75f03b6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_97_155000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x0191863e70560061bb3405010ffd33a16aab19844f4241116da88e931af7a648",
-                    "mixHash" : "0xbdf2cd804e3df5d583d5ff113b78693fcd723e5b930c1b1ce310443f345dc2bc",
-                    "nonce" : "0x535e0e12b4524c41",
+                    "hash" : "0x8293cc7f21972bc5411bd6e813a479312c0195504c0c9b3dab0716364589eac9",
+                    "mixHash" : "0x26f4f49506d0b7ccc3d7b6f51e8fcab2be7f6c30555983b1866f9ed59d25ac96",
+                    "nonce" : "0x8dc180d771236ac6",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0bdf2cd804e3df5d583d5ff113b78693fcd723e5b930c1b1ce310443f345dc2bc88535e0e12b4524c41f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a026f4f49506d0b7ccc3d7b6f51e8fcab2be7f6c30555983b1866f9ed59d25ac96888dc180d771236ac6f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0191863e70560061bb3405010ffd33a16aab19844f4241116da88e931af7a648",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8293cc7f21972bc5411bd6e813a479312c0195504c0c9b3dab0716364589eac9",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_155000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_97_155000_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/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02f950",
-                    "hash" : "0xcbe5e5ae0338da9403cf5fdfc98fce8ff0bf5d60634c6ff6ed0fef7793d9fdf0",
-                    "mixHash" : "0x83bf70e3ef900f03246e4a1e95bb5426a2b12cb5f24e0e3879d74f44aa2b91c5",
-                    "nonce" : "0x9da102c5545afa39",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x0740d712c23781a3dcfd857c39829a1eefb5090ce4c967edafbb0ac487be5e6c",
+                    "mixHash" : "0x19141bc9fd187fec9b7b47baafcb4eb0b272b798f2b33a7fef12c851ac43ab13",
+                    "nonce" : "0xd71aa6ad4905a075",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91",
-                    "stateRoot" : "0x31be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645f",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a083bf70e3ef900f03246e4a1e95bb5426a2b12cb5f24e0e3879d74f44aa2b91c5889da102c5545afa39f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a019141bc9fd187fec9b7b47baafcb4eb0b272b798f2b33a7fef12c851ac43ab1388d71aa6ad4905a075f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbe5e5ae0338da9403cf5fdfc98fce8ff0bf5d60634c6ff6ed0fef7793d9fdf0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0740d712c23781a3dcfd857c39829a1eefb5090ce4c967edafbb0ac487be5e6c",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8fc4a",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f03b6",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_155000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_97_155000_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/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x90618025346260b19ee0493e6197c077d2efc0369402c67c2c30bd04c75abe82",
-                    "mixHash" : "0x3bbc29a3b0dfb3b4147d67ed1ca0503b87a70bd080867a86bf19121e6bc1f247",
-                    "nonce" : "0xb4a7e5fa458e2667",
+                    "hash" : "0x360deef3757775685b8877d428c1e5ced61d3b70738c18c9ad7a87d5a8cd5635",
+                    "mixHash" : "0xd0372d0b145c5e67e2a4845ae47fcf148d3b8e561613d3aec8bff5f19078887b",
+                    "nonce" : "0x5ef2007a3bf75913",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a03bbc29a3b0dfb3b4147d67ed1ca0503b87a70bd080867a86bf19121e6bc1f24788b4a7e5fa458e2667f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0d0372d0b145c5e67e2a4845ae47fcf148d3b8e561613d3aec8bff5f19078887b885ef2007a3bf75913f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90618025346260b19ee0493e6197c077d2efc0369402c67c2c30bd04c75abe82",
-        "network" : "Homestead",
+        "lastblockhash" : "0x360deef3757775685b8877d428c1e5ced61d3b70738c18c9ad7a87d5a8cd5635",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_155000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_97_155000_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/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x9e6401d0de444260cb50d886899e168e64e9e974e66e88084abf637117f0502a",
-                    "mixHash" : "0x1a4d392982d343d9f941f032c0c74c568c4a0fb720c9f1356938fdcb5c8e6b12",
-                    "nonce" : "0x590c5c1b2462f708",
+                    "hash" : "0x988145be236c384669b2910dc0b2060eae704cd71fe45bec61340d515b1c87e1",
+                    "mixHash" : "0xcbbda03a59a9eb1a9c8793d13432c7bf6c59dfb768bc7148eb9d6cad1f638d82",
+                    "nonce" : "0xdba8f8ccb842a8e3",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
-                    "stateRoot" : "0x1984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202",
+                    "receiptTrie" : "0xce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91",
+                    "stateRoot" : "0x31be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01984e6d9c1c7da2c9a57952f9b6deff83c6e49ba18e799029757716a9c3cc202a0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a01a4d392982d343d9f941f032c0c74c568c4a0fb720c9f1356938fdcb5c8e6b1288590c5c1b2462f708f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a031be61376308cda68c4a8c38047805a5d08fddc35f0fc92bddbc57ab82bd645fa0b746f1036348443019bbb0f2c65f78698894fbcaf76b296e89917a418d27728ca0ce674ec11e57527fed04d8e13682555a8898858ff38d09e1738da75027a21e91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0cbbda03a59a9eb1a9c8793d13432c7bf6c59dfb768bc7148eb9d6cad1f638d8288dba8f8ccb842a8e3f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ba03875bf970c5eeb701b46773353a678cd463b230171b2b23c12e652823128e5c6a065d7117404be8d309a87f1eace8c7be4cfe1fb146ce95fb925059ef35343c35ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e6401d0de444260cb50d886899e168e64e9e974e66e88084abf637117f0502a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x988145be236c384669b2910dc0b2060eae704cd71fe45bec61340d515b1c87e1",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f8fc4a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json
index 588a5b748..307d6a8f5 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_97_20500_d0g0v0_EIP150" : {
+    "modexp_37120_37111_97_20500_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/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x1c6981dc221f8ba36b32e220a2795b732020f4dce8bb503fa959fa28ada87c8f",
-                    "mixHash" : "0xefefd18fd30d723cbb672f81b194f99718162117c39ab0f4f3bfd6130727501c",
-                    "nonce" : "0x6601fbc5ae5f3ac8",
+                    "hash" : "0xb8e21bffd9cd0b8e693815e04c80323965911ece23067684e6ef247d29e7cd3c",
+                    "mixHash" : "0x12dc161af5b402cb934614b6882fe76b3fbd285f1252e0d0f941dc51d15f339e",
+                    "nonce" : "0x083963f346a40610",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
-                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
+                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
+                    "stateRoot" : "0x46e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0efefd18fd30d723cbb672f81b194f99718162117c39ab0f4f3bfd6130727501c886601fbc5ae5f3ac8f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701da07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a012dc161af5b402cb934614b6882fe76b3fbd285f1252e0d0f941dc51d15f339e88083963f346a40610f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c6981dc221f8ba36b32e220a2795b732020f4dce8bb503fa959fa28ada87c8f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb8e21bffd9cd0b8e693815e04c80323965911ece23067684e6ef247d29e7cd3c",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6eee6",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_20500_d0g0v0_EIP158" : {
+    "modexp_37120_37111_97_20500_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/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x080630333f08f107a2844b731eb0ec5f8162fa7920665de3ad9095894c0304cb",
-                    "mixHash" : "0xf7fd9325fc1fc570e2c78073e6dd67cf73ee7d20c7b042a34b78d14087572dcc",
-                    "nonce" : "0x4b5e649b694e357d",
+                    "hash" : "0x097c0245f24bbdc870bd14900b84d215d2498613e9c4c1d9e07adcd30494ce7b",
+                    "mixHash" : "0x958d8c48630cb2be807396b4c560017e8c619b6f383fe1fa75726239d3e80862",
+                    "nonce" : "0x65dce10f8c35b578",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
-                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
+                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
+                    "stateRoot" : "0x46e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0f7fd9325fc1fc570e2c78073e6dd67cf73ee7d20c7b042a34b78d14087572dcc884b5e649b694e357df90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701da07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0958d8c48630cb2be807396b4c560017e8c619b6f383fe1fa75726239d3e808628865dce10f8c35b578f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x080630333f08f107a2844b731eb0ec5f8162fa7920665de3ad9095894c0304cb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x097c0245f24bbdc870bd14900b84d215d2498613e9c4c1d9e07adcd30494ce7b",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6eee6",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_20500_d0g0v0_Frontier" : {
+    "modexp_37120_37111_97_20500_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/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x7532132f827299bd0371a6b8d45adb01399d9e96664825d5194185893f4eb93f",
-                    "mixHash" : "0x3e5a0157e8846a582e4075e0f62c526a4b475b80b71225b0113cf7584760ca52",
-                    "nonce" : "0xe628063183284e0a",
+                    "hash" : "0xa8df3247972ee75183231c6b6676c80aee2bc4563cb89264d4c282998a253632",
+                    "mixHash" : "0x9e92ca862479eb9b94549591f566da4f38ee70aea1061a54766ab825f9be1b0b",
+                    "nonce" : "0x23fa3bda2db247ff",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a03e5a0157e8846a582e4075e0f62c526a4b475b80b71225b0113cf7584760ca5288e628063183284e0af90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a09e92ca862479eb9b94549591f566da4f38ee70aea1061a54766ab825f9be1b0b8823fa3bda2db247fff90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7532132f827299bd0371a6b8d45adb01399d9e96664825d5194185893f4eb93f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa8df3247972ee75183231c6b6676c80aee2bc4563cb89264d4c282998a253632",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_20500_d0g0v0_Homestead" : {
+    "modexp_37120_37111_97_20500_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/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0xead8229dbedad46f7306e4a23cf0f1f301007fafd8a97c63f7de7a8a9d6e5b6e",
-                    "mixHash" : "0xe3d182a5c2be3a686ed8550ab706e4df00f40f31e19bf835486984a8a8881014",
-                    "nonce" : "0x5fb8ff7158aa6e7e",
+                    "hash" : "0xeaf2f8b6143c8cadfface6fc595fdd93bb4673770ee996b212df2c918cdab650",
+                    "mixHash" : "0xf89e59e9d7883b8f0bc2ffbc10aa4f52eaef49be3060f26b4b0dd98a3ce9b604",
+                    "nonce" : "0xb5dc9225abfd3617",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0e3d182a5c2be3a686ed8550ab706e4df00f40f31e19bf835486984a8a8881014885fb8ff7158aa6e7ef90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0f89e59e9d7883b8f0bc2ffbc10aa4f52eaef49be3060f26b4b0dd98a3ce9b60488b5dc9225abfd3617f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xead8229dbedad46f7306e4a23cf0f1f301007fafd8a97c63f7de7a8a9d6e5b6e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeaf2f8b6143c8cadfface6fc595fdd93bb4673770ee996b212df2c918cdab650",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_20500_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_97_20500_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/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0xd30e974b13ae21f5b716feafd48e270fb79052eeedb701303bb0a8ee0e50c755",
-                    "mixHash" : "0xd4d39a08f4a7a1f0d4d27f1234e352b1585d252580cc30c970e267d0feb3a34f",
-                    "nonce" : "0x011cb7c3bc0471b9",
+                    "hash" : "0xbce531c77772621bae1a122967dee01a07c86862acf7ba8089a5fac971750f70",
+                    "mixHash" : "0x598900b88a5599d22ecb1d23b7ed124f1e98f954717a47208e84bb891ee32615",
+                    "nonce" : "0xb1d6839b0702fe96",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
-                    "stateRoot" : "0x46e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701d",
+                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
+                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046e0354fc48b7abd22d0a832389761a643bbad8d85bd15e5afb0ed364009701da07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0d4d39a08f4a7a1f0d4d27f1234e352b1585d252580cc30c970e267d0feb3a34f88011cb7c3bc0471b9f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0598900b88a5599d22ecb1d23b7ed124f1e98f954717a47208e84bb891ee3261588b1d6839b0702fe96f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd30e974b13ae21f5b716feafd48e270fb79052eeedb701303bb0a8ee0e50c755",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbce531c77772621bae1a122967dee01a07c86862acf7ba8089a5fac971750f70",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6eee6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761111a",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_97_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xebec",
+                    "hash" : "0xc76c2133311cd2078ef66eee421b330b39bfbf3797b023cdc9e1c1123e2e5445",
+                    "mixHash" : "0x754e6ba2edc64abd005fd6565ffd702897ee0e77b715f21ade16d0b84fe4eb11",
+                    "nonce" : "0xe6d754c2f2c99472",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x47f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31c",
+                    "stateRoot" : "0xfe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90426f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fe5e0550af36f04d990c3658f0122a91a466db715de8635e84ab8d421ef8c451a07ecd5cbc4877afb361386aa33b1e5579e8a203e47c35b68649d8bb5dc8081fb8a047f15054b17539fd2e2723fa0a2decda6e5db8dce48f35eabf56b2a9da5ba31cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0754e6ba2edc64abd005fd6565ffd702897ee0e77b715f21ade16d0b84fe4eb1188e6d754c2f2c99472f90227f90224010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001b9fb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360a03efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xebec",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xb35805d3c2e40c21daee4fbe6d5e42d551b4473478fa3831da63cc69a18360",
+                        "s" : "0x3efdd86ea1ed3a77805e429732dd4bfd12ccd04734512c0dc33cd450e6a62e88",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc76c2133311cd2078ef66eee421b330b39bfbf3797b023cdc9e1c1123e2e5445",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json
index 3a37278ef..c19982b25 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_97_22000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_97_22000_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/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x46204e0e9beb6d3e473904d68eca129efacc02f9fefe4a5fa16853cd3a2ffa73",
-                    "mixHash" : "0xce15b9733021440018d3a851b04a1e251594627c8c9ddbfdfe4d5d1e6e1177d6",
-                    "nonce" : "0x6ce133a5493b9e26",
+                    "gasUsed" : "0xf1c8",
+                    "hash" : "0xac70c50709d82b2b4ff8336a4cbb1f3e1bad07803a219125b35f888f21564037",
+                    "mixHash" : "0x39fd6668a9bbde8834ffe5dbb0d4892b0b21ab18ef4e693f0dcf1f4a11af3f00",
+                    "nonce" : "0x0443c88f2f17a7ed",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
+                    "stateRoot" : "0x46bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0ce15b9733021440018d3a851b04a1e251594627c8c9ddbfdfe4d5d1e6e1177d6886ce133a5493b9e26f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a039fd6668a9bbde8834ffe5dbb0d4892b0b21ab18ef4e693f0dcf1f4a11af3f00880443c88f2f17a7edf90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46204e0e9beb6d3e473904d68eca129efacc02f9fefe4a5fa16853cd3a2ffa73",
-        "network" : "EIP150",
+        "lastblockhash" : "0xac70c50709d82b2b4ff8336a4cbb1f3e1bad07803a219125b35f888f21564037",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f6f4c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a7610b3e",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_97_22000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_97_22000_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/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf1c8",
+                    "hash" : "0x8c05b002fd7b7b5d45c1bf7fc3847d38c7e4c8c01dcc00965f6d182c5dde4ff6",
+                    "mixHash" : "0x165976c6911afbaac58f2ca788a0133cf5c7cf20d0618b32dc71efb30b8445a5",
+                    "nonce" : "0x37c7c5d79bed0c2f",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
+                    "stateRoot" : "0x46bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0165976c6911afbaac58f2ca788a0133cf5c7cf20d0618b32dc71efb30b8445a58837c7c5d79bed0c2ff90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xf1c8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910",
+                        "s" : "0x334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8c05b002fd7b7b5d45c1bf7fc3847d38c7e4c8c01dcc00965f6d182c5dde4ff6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6f4c2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7610b3e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_97_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0xcf3090cc18d756de08bb961fb85c556e7d0fe88bfa8ef1b938cb833bf4993442",
-                    "mixHash" : "0x40ef17ed9131d0d1576caf238b21f7f5ffb5f6ff6a14b03d90dc8463180925e4",
-                    "nonce" : "0x75da329c8ff04d33",
+                    "hash" : "0x6e39330c3f69f0fc2dea8e76b90d3e458c4f97cf22618cfa5c57e5bf8dab1735",
+                    "mixHash" : "0x8bf2b2497df2ff6486fe02e0161dd413d88d6885e500fd94f7930ff9cdd2e1cd",
+                    "nonce" : "0x202cd4de3e118fe6",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a040ef17ed9131d0d1576caf238b21f7f5ffb5f6ff6a14b03d90dc8463180925e48875da329c8ff04d33f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a08bf2b2497df2ff6486fe02e0161dd413d88d6885e500fd94f7930ff9cdd2e1cd88202cd4de3e118fe6f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf3090cc18d756de08bb961fb85c556e7d0fe88bfa8ef1b938cb833bf4993442",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6e39330c3f69f0fc2dea8e76b90d3e458c4f97cf22618cfa5c57e5bf8dab1735",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_22000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_97_22000_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/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1c8",
-                    "hash" : "0xe54b7076b77175046a7e10c87876ff2c3d0d1ce8c736bd20099c947fa38332ca",
-                    "mixHash" : "0x8be99882184fc858cd6eaeac1fb9211df678b91045868a6b532b7fb8af7f2d35",
-                    "nonce" : "0x33e48e0da1d6c43b",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x4e44963ac80596b0c1e64e65f43d6afc1ca975a47767bd64e8af90d2c5cd558a",
+                    "mixHash" : "0x90effa500f4a05297633236b9efca41de6145c653d7de0577f2d008fd08f3e8b",
+                    "nonce" : "0x944e6fd7ac30c8b7",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x70048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1",
-                    "stateRoot" : "0xfcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a08be99882184fc858cd6eaeac1fb9211df678b91045868a6b532b7fb8af7f2d358833e48e0da1d6c43bf90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a090effa500f4a05297633236b9efca41de6145c653d7de0577f2d008fd08f3e8b88944e6fd7ac30c8b7f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe54b7076b77175046a7e10c87876ff2c3d0d1ce8c736bd20099c947fa38332ca",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4e44963ac80596b0c1e64e65f43d6afc1ca975a47767bd64e8af90d2c5cd558a",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4c2",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b3e",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_22000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_97_22000_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/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0xaab01cf5af6b5a12d18922402d2951670862bcf557fbf45284fd5da2932ae555",
-                    "mixHash" : "0x94236dd0fa7287564feaededee1db700bd713543ca741a19e54ad9242fe75765",
-                    "nonce" : "0x4ad1774b6c69f567",
+                    "hash" : "0xc38625ee56f8ab80a09b3105deaaee952141fe7a0f46e0098f7ec6e9f3c65aa1",
+                    "mixHash" : "0x9deb5478dfa7cc1c6c552e0406408cf42937e39d0a3fdf1b9f4f8c5e2eefd767",
+                    "nonce" : "0xf9b6068e9c3b92a8",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x70048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a094236dd0fa7287564feaededee1db700bd713543ca741a19e54ad9242fe75765884ad1774b6c69f567f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a09deb5478dfa7cc1c6c552e0406408cf42937e39d0a3fdf1b9f4f8c5e2eefd76788f9b6068e9c3b92a8f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaab01cf5af6b5a12d18922402d2951670862bcf557fbf45284fd5da2932ae555",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc38625ee56f8ab80a09b3105deaaee952141fe7a0f46e0098f7ec6e9f3c65aa1",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_22000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_97_22000_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/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0xe2f7e20f2f4c7dd907c7bbfb00356e5b6043d8efa3c78d9645ee2cf64814ce69",
-                    "mixHash" : "0x4a93fe4e1eae0a0f61df34630f1a16f880e3df8d57914cc5a875fae923689881",
-                    "nonce" : "0x470c242bbae4bd78",
+                    "hash" : "0x6f7fb8890b43c44df81410a525bbed8b273bcaaff355020e72b737a2d916091a",
+                    "mixHash" : "0x3722bfb32a9990bbec855dee793e6d05ed6b7fe9073ca9e2479f06d912b29746",
+                    "nonce" : "0x60499048c3b1b59d",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
-                    "stateRoot" : "0x46bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17",
+                    "receiptTrie" : "0x70048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1",
+                    "stateRoot" : "0xfcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a046bd8f526779fc73bd0fe712ac340bbe023f4a5e4d126fd046b33ce5e9eddc17a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a04a93fe4e1eae0a0f61df34630f1a16f880e3df8d57914cc5a875fae92368988188470c242bbae4bd78f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fcbb510009b5da9365dd0b56d8d3ddb5b772cf7db2316d6ba2b4ce92927d77a7a04f6b88a4213dcf0d78178267b81281700e1eb5576ac9094f657b3308a5d13cdca070048a36da738a9bfdac33f499bb87d18c4143689beae4ebf4e1d7197c50c5e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a03722bfb32a9990bbec855dee793e6d05ed6b7fe9073ca9e2479f06d912b297468860499048c3b1b59df90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca07ab4c4c6bd8095700543646e07d71c11ac5b3e59239c7139a922e8a8bd254910a0334f3624ce9a6c5eb84b9fd9dcba4e63ea9433f6e5658995ad95067063da505bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2f7e20f2f4c7dd907c7bbfb00356e5b6043d8efa3c78d9645ee2cf64814ce69",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6f7fb8890b43c44df81410a525bbed8b273bcaaff355020e72b737a2d916091a",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6f4c2",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json
index 5ccad2ca1..709cdfd7f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_97_25000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_97_25000_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/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x4de10d0cc566abc2bdec1127d9e7055070f227a1769bb12d358e110c08c57af2",
-                    "mixHash" : "0x58f15c0c1620919606717f125c16088ecdc3d4711dc9f78bd5c042c00e03a209",
-                    "nonce" : "0xcfabc875ad9d717c",
+                    "gasUsed" : "0xfd80",
+                    "hash" : "0x43a44f992fa956b2ebd2a67343c8cbabdbe1c1252f84503d45c1257ff096040e",
+                    "mixHash" : "0x7326e0557e52426a35bf580cd03c81df7f53569db5ecd58c596fe6238939b049",
+                    "nonce" : "0x50a83af37bdf4a5e",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
+                    "stateRoot" : "0x7e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a058f15c0c1620919606717f125c16088ecdc3d4711dc9f78bd5c042c00e03a20988cfabc875ad9d717cf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011efa04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a07326e0557e52426a35bf580cd03c81df7f53569db5ecd58c596fe6238939b0498850a83af37bdf4a5ef90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4de10d0cc566abc2bdec1127d9e7055070f227a1769bb12d358e110c08c57af2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x43a44f992fa956b2ebd2a67343c8cbabdbe1c1252f84503d45c1257ff096040e",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f7007a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a760ff86",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_97_25000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_97_25000_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/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xfd80",
+                    "hash" : "0xee835b62811bb16594940741431802584d09819bfb3fed17d6ef9c90fd357414",
+                    "mixHash" : "0x1d474151bc7bb67ffd4d32bce3d1104f5746fd2d4fcf31a9a970b906591ca91f",
+                    "nonce" : "0x78e0fd98f9b24f49",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
+                    "stateRoot" : "0x7e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011ef",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011efa04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a01d474151bc7bb67ffd4d32bce3d1104f5746fd2d4fcf31a9a970b906591ca91f8878e0fd98f9b24f49f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xfd80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xb1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1",
+                        "s" : "0x053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xee835b62811bb16594940741431802584d09819bfb3fed17d6ef9c90fd357414",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7007a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760ff86",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_97_25000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x2926dc27d6aa0ce41c08972dd17da7406130a8c6336f54951399e740ba63e32a",
-                    "mixHash" : "0xdba2e17c82a44609b6f9242164cfc19eec581ed3d56f3dc676b68247b60f78be",
-                    "nonce" : "0x023d04fb9e638a23",
+                    "hash" : "0xa47f24d8cb577e4e9e560e6cc94c585e9cf2ccd0dea5770b79fc9421e75390fa",
+                    "mixHash" : "0x38a3d06b55c5481164d80616321bda0bfa90587a7a58da7007942ba1f6dd5781",
+                    "nonce" : "0x1c82a027831e2afb",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0dba2e17c82a44609b6f9242164cfc19eec581ed3d56f3dc676b68247b60f78be88023d04fb9e638a23f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a038a3d06b55c5481164d80616321bda0bfa90587a7a58da7007942ba1f6dd5781881c82a027831e2afbf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2926dc27d6aa0ce41c08972dd17da7406130a8c6336f54951399e740ba63e32a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa47f24d8cb577e4e9e560e6cc94c585e9cf2ccd0dea5770b79fc9421e75390fa",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_25000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_97_25000_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/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xfd80",
-                    "hash" : "0x2eea1b448101c3c384ce2c5c94678abcfbb674ba7668e2dee390701e773ff709",
-                    "mixHash" : "0xbb0c27394820e1f032351c2ed106a7bcf7eca643622720df8116b1fe767a61a4",
-                    "nonce" : "0x62ac2a7976ae56bf",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x2ffcad857eda6d745b2ffe16901aaadcc15cd09f150bffc2676cac2c7a86dff2",
+                    "mixHash" : "0xd2c7d944b7953874b578422f91b1a5b429a48d8cc024db5b54b58650565c88e4",
+                    "nonce" : "0x458df99843e2aaa3",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x9dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efa",
-                    "stateRoot" : "0x7c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9c",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0bb0c27394820e1f032351c2ed106a7bcf7eca643622720df8116b1fe767a61a48862ac2a7976ae56bff90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0d2c7d944b7953874b578422f91b1a5b429a48d8cc024db5b54b58650565c88e488458df99843e2aaa3f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2eea1b448101c3c384ce2c5c94678abcfbb674ba7668e2dee390701e773ff709",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2ffcad857eda6d745b2ffe16901aaadcc15cd09f150bffc2676cac2c7a86dff2",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7007a",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ff86",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_25000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_97_25000_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/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0xefce080a563c5b3ebdd97a97a76c14c17744c6411f372f90febf4e478b8b0430",
-                    "mixHash" : "0x2568e8d7c3ef3a859abbc0f9e88f5dd05d8875f8a0b040afa35b87a26e3dd937",
-                    "nonce" : "0x28565ea370255f82",
+                    "hash" : "0x8a649b1b1c33447987c84e9a9a24c1a7ee4f9fc774812d65889d5e5f5b086938",
+                    "mixHash" : "0xddc979f8528f2fdaffeca3a1cc5c1281a79841f984d996af42a897b7ec20bf3e",
+                    "nonce" : "0x850cb4142ec61cdd",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x9dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efa",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a02568e8d7c3ef3a859abbc0f9e88f5dd05d8875f8a0b040afa35b87a26e3dd9378828565ea370255f82f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0ddc979f8528f2fdaffeca3a1cc5c1281a79841f984d996af42a897b7ec20bf3e88850cb4142ec61cddf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefce080a563c5b3ebdd97a97a76c14c17744c6411f372f90febf4e478b8b0430",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8a649b1b1c33447987c84e9a9a24c1a7ee4f9fc774812d65889d5e5f5b086938",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_25000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_97_25000_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/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0x8235edf7084abae5cbde91c9277d972e14b8209bbfd4c57f55b07c688c990a55",
-                    "mixHash" : "0xf9a9b4cf19d43d5c23a7881f273ca1ee3d883adeb4067268b07f629e5e3aafc5",
-                    "nonce" : "0xe7eb1221cd22a48c",
+                    "hash" : "0x61b99b731c30bd3a3ba5e0a6b29da80ab35163109f7bcdfe199e3549684faf6d",
+                    "mixHash" : "0xc2f11531149864d2b0ba0e78bd6bad17ba29ee70738e7b5ae552c5ce2037f21b",
+                    "nonce" : "0x4a374d378de712c2",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
-                    "stateRoot" : "0x7e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011ef",
+                    "receiptTrie" : "0x9dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efa",
+                    "stateRoot" : "0x7c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07e0c1a38381a8f5bcb2b6cfa4a350863bba811106491e7d9d7833afdd03011efa04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0f9a9b4cf19d43d5c23a7881f273ca1ee3d883adeb4067268b07f629e5e3aafc588e7eb1221cd22a48cf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
+                "rlp" : "0xf90427f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a07c9820abba0bd39fecc71fc28bb6281086bcb5ce06b23ef02901ede03f3e5b9ca04b8c1ca8619322db90567e0972416c3e3c94ec09960d0aa259ed521acb5f3d4da09dcd5723e4d7e7b8d1e3af4f93841f55aae0d959dc87b1b102c2bfaa0ff11efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0c2f11531149864d2b0ba0e78bd6bad17ba29ee70738e7b5ae552c5ce2037f21b884a374d378de712c2f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca0b1193ad06b88ad7ee55aa40eb8e8fff5565fb4a66e30070107f37398183201a1a0053fef5caa52d65ae04131bba584a16b7bca28961e1df152d114c2e8baf7d3d5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8235edf7084abae5cbde91c9277d972e14b8209bbfd4c57f55b07c688c990a55",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x61b99b731c30bd3a3ba5e0a6b29da80ab35163109f7bcdfe199e3549684faf6d",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7007a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json
index f415778ad..b1645a66f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_37120_37111_97_35000_d0g0v0_EIP150" : {
+    "modexp_37120_37111_97_35000_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/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf182",
-                    "hash" : "0x2fb1cad20e841b56755503a700674f9c9bd59ea59ed0cba517a99bc18ad25860",
-                    "mixHash" : "0xf00e1d9cfb5d584c27c5a0c056743396ccb8232d602825f72a6997e601494ac8",
-                    "nonce" : "0xd6f7a15b8b412ad6",
+                    "gasUsed" : "0x012490",
+                    "hash" : "0xdc77e674a2d7f8de278352b8d892aa51499325e9a5a0ee0471924db040489320",
+                    "mixHash" : "0x223ebc655279520af07521864e20f0c066db11bf1f65d8ddbdc12bcf6b7fff67",
+                    "nonce" : "0x0d0ee86567eec1e1",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
-                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
+                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
+                    "stateRoot" : "0x4e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0f00e1d9cfb5d584c27c5a0c056743396ccb8232d602825f72a6997e601494ac888d6f7a15b8b412ad6f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992ba0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0223ebc655279520af07521864e20f0c066db11bf1f65d8ddbdc12bcf6b7fff67880d0ee86567eec1e1f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fb1cad20e841b56755503a700674f9c9bd59ea59ed0cba517a99bc18ad25860",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdc77e674a2d7f8de278352b8d892aa51499325e9a5a0ee0471924db040489320",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f47c",
+                "balance" : "0x4563918244f7278a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b84",
+                "balance" : "0x0de0b6b3a760d876",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_37120_37111_97_35000_d0g0v0_EIP158" : {
+    "modexp_37120_37111_97_35000_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/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x012490",
+                    "hash" : "0xdeae3bf880747da3686da5eeffedcbd2c168be569153acc1b27d6fd68050d949",
+                    "mixHash" : "0xa43c21cb75cdec8c65409a6b41dbb7c26807a5a38533079b2c5550b5f91267e1",
+                    "nonce" : "0xfb48510b26c3925c",
+                    "number" : "0x01",
+                    "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
+                    "stateRoot" : "0x4e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992ba0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0a43c21cb75cdec8c65409a6b41dbb7c26807a5a38533079b2c5550b5f91267e188fb48510b26c3925cf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x012490",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x01497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90c",
+                        "s" : "0x5dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdeae3bf880747da3686da5eeffedcbd2c168be569153acc1b27d6fd68050d949",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7278a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760d876",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_37120_37111_97_35000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf182",
-                    "hash" : "0x5a647013e4a045395f9d6c12bf9247c05631a7df3ddcb8b8bdcf5fed3fc42ef3",
-                    "mixHash" : "0x5969010ba7a7a82099429026298cdeda7b3f1539a37fd203e1cdc4955dd83285",
-                    "nonce" : "0x70412f8b873f3c3b",
+                    "hash" : "0xb265527abc43aa74c25dcb32dbeefb224b5964c1e9ab3a3c033ceff2305da859",
+                    "mixHash" : "0xf0358655b213ff5e09cce6d2580453b55c941d12e3d8b3e329c1248a5c12e706",
+                    "nonce" : "0x98bc233e2390068a",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a05969010ba7a7a82099429026298cdeda7b3f1539a37fd203e1cdc4955dd832858870412f8b873f3c3bf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0f0358655b213ff5e09cce6d2580453b55c941d12e3d8b3e329c1248a5c12e7068898bc233e2390068af90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a647013e4a045395f9d6c12bf9247c05631a7df3ddcb8b8bdcf5fed3fc42ef3",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb265527abc43aa74c25dcb32dbeefb224b5964c1e9ab3a3c033ceff2305da859",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_35000_d0g0v0_Frontier" : {
+    "modexp_37120_37111_97_35000_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/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x012490",
-                    "hash" : "0xd8c48e7ed87e7a148bcf2125678afb24b0a7b32fd617e05ad0f2bd610769207d",
-                    "mixHash" : "0xbfe4f6dbfa9725179e33fe99508e6ad10fb1e8c35e9fc028776c7dd929a5cf8a",
-                    "nonce" : "0xd72f14509a9546ba",
+                    "gasUsed" : "0xf182",
+                    "hash" : "0x2fec0a6d79b28eb1ddbbf2456e76036deb9fc848b75819be88c30b0ea5025594",
+                    "mixHash" : "0xd1e55334122a6eb780bcaebb5aa569948e3afceea980835f27d44de3d2aec499",
+                    "nonce" : "0x34c5db61bbce45c0",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084f",
-                    "stateRoot" : "0xb6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851",
+                    "receiptTrie" : "0x8951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6b",
+                    "stateRoot" : "0xac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0bfe4f6dbfa9725179e33fe99508e6ad10fb1e8c35e9fc028776c7dd929a5cf8a88d72f14509a9546baf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "rlp" : "0xf90428f901f8a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ac9a66a31d1e7b29fc69f43c65b22715e2f83ec680ccb57883e189c9795977f6a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba08951946127be66a217da876113c85c96ed6327cfc79f8a6e0e3ac574c9599e6bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1828203e880a0d1e55334122a6eb780bcaebb5aa569948e3afceea980835f27d44de3d2aec4998834c5db61bbce45c0f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8c48e7ed87e7a148bcf2125678afb24b0a7b32fd617e05ad0f2bd610769207d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2fec0a6d79b28eb1ddbbf2456e76036deb9fc848b75819be88c30b0ea5025594",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7278a",
+                "balance" : "0x4563918244f6f47c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760d876",
+                "balance" : "0x0de0b6b3a7610b84",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_35000_d0g0v0_Homestead" : {
+    "modexp_37120_37111_97_35000_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/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xee069b3f070d009a16df9a2582b9158ca15cba18e05cd2b72be48f7d6c9aad76",
-                    "mixHash" : "0x030e51ed3a707a4fd92a6ca9e897e37f7563173793cf4cac5a00875805e553be",
-                    "nonce" : "0x6b3f1635fb6ec0d2",
+                    "hash" : "0x20cef610a5269b7df07d1e1f508a60e27392b793fbed2a3a00b0af82e281214e",
+                    "mixHash" : "0x04bf9cda4781884a800fa956948ce1e1f83f65eeb8a4a9f485104d44f23b308c",
+                    "nonce" : "0xc53c544678c49a42",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
                     "receiptTrie" : "0xac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084f",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0030e51ed3a707a4fd92a6ca9e897e37f7563173793cf4cac5a00875805e553be886b3f1635fb6ec0d2f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a004bf9cda4781884a800fa956948ce1e1f83f65eeb8a4a9f485104d44f23b308c88c53c544678c49a42f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee069b3f070d009a16df9a2582b9158ca15cba18e05cd2b72be48f7d6c9aad76",
-        "network" : "Homestead",
+        "lastblockhash" : "0x20cef610a5269b7df07d1e1f508a60e27392b793fbed2a3a00b0af82e281214e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_37120_37111_97_35000_d0g0v0_Metropolis" : {
+    "modexp_37120_37111_97_35000_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/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xa1d8784e9295f864942e31d82b1f4cf8bc2f339c9d173158a62f4483e2a256a9",
-                    "mixHash" : "0x3f1e5a85675eaf21bf20155adfa932d729b0db26858396b85931556e2e7cbce6",
-                    "nonce" : "0x32c61d03a8bf31f9",
+                    "hash" : "0xb7905db2e29f7b61d8b29fbe9e135fdef3d7a7cde2155ffbe66e5bd18ec623b5",
+                    "mixHash" : "0x5f2d058f972ad40cb5c87838b063dadecf69a834e6dd285477c52073f8e70c4b",
+                    "nonce" : "0x256b91ef001e3d70",
                     "number" : "0x01",
                     "parentHash" : "0x386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89",
-                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
-                    "stateRoot" : "0x4e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992b",
+                    "receiptTrie" : "0xac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084f",
+                    "stateRoot" : "0xb6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04e2373612d3e0322c0d1070df3107a979d2defb73af25cd6946b85de4a88992ba0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a03f1e5a85675eaf21bf20155adfa932d729b0db26858396b85931556e2e7cbce68832c61d03a8bf31f9f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
+                "rlp" : "0xf90429f901f9a0386d22561f5943f7fbeb0b470698495875c6ee00830b0463f88bcccbca717c89a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b6500cfa0a7693edef44448a9fd12ef5d39929aace6891e7546ca8f7ee36b851a0c55631d3d8fdee455f9b762d06141dde84e8d2cbffeb3c370f98e517248f6ddba0ac584ca5099c93fd4b7ab5bccb7029ed90d7eca16ec62f050db738ba3efb084fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a05f2d058f972ad40cb5c87838b063dadecf69a834e6dd285477c52073f8e70c4b88256b91ef001e3d70f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9761000000000000000000000000000000000000000000000000000000000000001ca001497e8b88ef95cb72cdd7633cde1c763d8e38400db09b031801bfda3b4ee90ca05dca9501dfea84232562eb78ce08c799c35dfc7645644660d8956379e8277f6bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cef8f431270393de1dead56a74b2fb6c7ce4299c18ca642c9bcf9496bcd5401ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1d8784e9295f864942e31d82b1f4cf8bc2f339c9d173158a62f4483e2a256a9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb7905db2e29f7b61d8b29fbe9e135fdef3d7a7cde2155ffbe66e5bd18ec623b5",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7278a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json
index cfc590ad8..3b324d199 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_39936_1_55201_1000000_d0g0v0_EIP150" : {
+    "modexp_39936_1_55201_1000000_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/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb65e",
-                    "hash" : "0x3ce47bc0b567669f4cc1e71622a5aa59f76c7216941f6365154b3e4984e83757",
-                    "mixHash" : "0x19df3005b0b02d653caaa38245ce88193c0f625cde97994a60dbc9370a82c18e",
-                    "nonce" : "0x6f3e52736ef05a57",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x984e946cf00b4c298ab26e36b316896145be99cbb13ae496298dcbc432f74d64",
+                    "mixHash" : "0xc41e4725c56c592abc14a11e865876fe68099d75038b3a3df004bc408f129737",
+                    "nonce" : "0x5d7ab60210f0a17c",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
-                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a019df3005b0b02d653caaa38245ce88193c0f625cde97994a60dbc9370a82c18e886f3e52736ef05a57f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0c41e4725c56c592abc14a11e865876fe68099d75038b3a3df004bc408f129737885d7ab60210f0a17cf90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ce47bc0b567669f4cc1e71622a5aa59f76c7216941f6365154b3e4984e83757",
-        "network" : "EIP150",
+        "lastblockhash" : "0x984e946cf00b4c298ab26e36b316896145be99cbb13ae496298dcbc432f74d64",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b84c",
+                "balance" : "0x4563918244f6b856",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147b4",
+                "balance" : "0x0de0b6b3a76147aa",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_39936_1_55201_1000000_d0g0v0_EIP158" : {
+    "modexp_39936_1_55201_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x8eccb0e79229eb9de3c88d94208de2ed9952c87b060c252ca15583c58cf43fbd",
+                    "mixHash" : "0xc29e3f2975e52d1836fb73a10af1c672f029d43599c3f621d51d00ac7f10aba1",
+                    "nonce" : "0x3731cbc88fcc87b7",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0c29e3f2975e52d1836fb73a10af1c672f029d43599c3f621d51d00ac7f10aba1883731cbc88fcc87b7f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0fa318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6",
+                        "s" : "0x4245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8eccb0e79229eb9de3c88d94208de2ed9952c87b060c252ca15583c58cf43fbd",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b856",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76147aa",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_39936_1_55201_1000000_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/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb65e",
-                    "hash" : "0x850ddd8adcb76ebeb7e9e9a097b3ed6f750edc48a369093cc07dc82c24d846bf",
-                    "mixHash" : "0xeade2b397d836a94a1614c46b150e3a4f5e2d158dfc7b079a0ecd3cfa0739d74",
-                    "nonce" : "0x0dd1118763dbb906",
+                    "hash" : "0x47e6f43356e71d5d1ddbb1445d0d8539a8292ff5def69d793716c5c3700251eb",
+                    "mixHash" : "0xae824644c5aa08a15e81c4d1381058a15a92405d2ec5465515d406a1dda975ab",
+                    "nonce" : "0x6c446136ae90e134",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0eade2b397d836a94a1614c46b150e3a4f5e2d158dfc7b079a0ecd3cfa0739d74880dd1118763dbb906f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0ae824644c5aa08a15e81c4d1381058a15a92405d2ec5465515d406a1dda975ab886c446136ae90e134f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x850ddd8adcb76ebeb7e9e9a097b3ed6f750edc48a369093cc07dc82c24d846bf",
-        "network" : "EIP158",
+        "lastblockhash" : "0x47e6f43356e71d5d1ddbb1445d0d8539a8292ff5def69d793716c5c3700251eb",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_1000000_d0g0v0_Frontier" : {
+    "modexp_39936_1_55201_1000000_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/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0fa318",
-                    "hash" : "0x54d2de0b54e0e54a547e3be1b178985a18ce6cd8c8c74b548e7e022de9d0065b",
-                    "mixHash" : "0x76176d15cdf6433b2f0ce807a36470593b7dec3f53953a58951be5d5fbb9cebd",
-                    "nonce" : "0x1c7bea782c615f0b",
+                    "gasUsed" : "0xb65e",
+                    "hash" : "0xc958864b68d4553896c69c79762501e236d83848ff57a39f8c1ac03fbceaf4ab",
+                    "mixHash" : "0x9bb805a963f5ee4a19e9457fa68d0d51d3a2999808901ec67deed5fca6b4be08",
+                    "nonce" : "0xc4b4c0cb2fc07f88",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x8bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0",
-                    "stateRoot" : "0xfa4ee362ebee4f3cc8cca1d10439ed90c2a789c5963f74d3916d2ad35248a283",
+                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
+                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fa4ee362ebee4f3cc8cca1d10439ed90c2a789c5963f74d3916d2ad35248a283a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a08bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fa3188203e880a076176d15cdf6433b2f0ce807a36470593b7dec3f53953a58951be5d5fbb9cebd881c7bea782c615f0bf90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a09bb805a963f5ee4a19e9457fa68d0d51d3a2999808901ec67deed5fca6b4be0888c4b4c0cb2fc07f88f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54d2de0b54e0e54a547e3be1b178985a18ce6cd8c8c74b548e7e022de9d0065b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc958864b68d4553896c69c79762501e236d83848ff57a39f8c1ac03fbceaf4ab",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x456391824505a506",
+                "balance" : "0x4563918244f6b84c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7525afa",
+                "balance" : "0x0de0b6b3a76147b4",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_1000000_d0g0v0_Homestead" : {
+    "modexp_39936_1_55201_1000000_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/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0fa318",
-                    "hash" : "0x2323e44eea397ca0402c88f05322935188854deef861d2844e987e12351dd588",
-                    "mixHash" : "0x9a5127aa7faaac5ef6b9cf4839ecc932bd4c5ffe906a3a0845368c8d5b5431e4",
-                    "nonce" : "0xe9a63594b73a4ccd",
+                    "hash" : "0x4f36b8f52dd406b928a3eb2066d609c9e676222c5cdf99e7e72121e3edac6a19",
+                    "mixHash" : "0xa9f9ddb18d613aea07beb25df6844620553789188eaf7f700302c2bec35643b8",
+                    "nonce" : "0x2c947d545aba5698",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x8bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fa4ee362ebee4f3cc8cca1d10439ed90c2a789c5963f74d3916d2ad35248a283a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a08bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fa3188203e880a09a5127aa7faaac5ef6b9cf4839ecc932bd4c5ffe906a3a0845368c8d5b5431e488e9a63594b73a4ccdf90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fa4ee362ebee4f3cc8cca1d10439ed90c2a789c5963f74d3916d2ad35248a283a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a08bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fa3188203e880a0a9f9ddb18d613aea07beb25df6844620553789188eaf7f700302c2bec35643b8882c947d545aba5698f90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2323e44eea397ca0402c88f05322935188854deef861d2844e987e12351dd588",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4f36b8f52dd406b928a3eb2066d609c9e676222c5cdf99e7e72121e3edac6a19",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_1000000_d0g0v0_Metropolis" : {
+    "modexp_39936_1_55201_1000000_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/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb668",
-                    "hash" : "0xf0adb13ffd7faa4295f265eb8f4032acc59af7aae9219e11391b7f75ca963ff6",
-                    "mixHash" : "0x307dd7827afe03f5c0b0b99f93065113d02d2532008dc23f53a67d65043d4f6e",
-                    "nonce" : "0xf0e416e51b3af6fe",
+                    "gasUsed" : "0x0fa318",
+                    "hash" : "0xe9c2f6ecbed0b059c70f2fa350d2b27605b3741fed2d8c15219072eb2708e764",
+                    "mixHash" : "0xe0faf66693ff6c277ec935de4db45af09267fa4a1c782cdfc3ec2c4928f45433",
+                    "nonce" : "0x9d8e419e74955aad",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
-                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "receiptTrie" : "0x8bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0",
+                    "stateRoot" : "0xfa4ee362ebee4f3cc8cca1d10439ed90c2a789c5963f74d3916d2ad35248a283",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0307dd7827afe03f5c0b0b99f93065113d02d2532008dc23f53a67d65043d4f6e88f0e416e51b3af6fef90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
+                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0fa4ee362ebee4f3cc8cca1d10439ed90c2a789c5963f74d3916d2ad35248a283a09d7a51c0efa32aa9dfc00f2bb92424ccf11278498af911e252659b0aa7550607a08bc97affd3629c497b6e9cea036ecbddfcaf182210203c93c139d62816b8c5f0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fa3188203e880a0e0faf66693ff6c277ec935de4db45af09267fa4a1c782cdfc3ec2c4928f45433889d8e419e74955aadf90169f901660101830fa31894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca0c0b48af8ffe428376f95a073fa836effdcbc6d9b5b274546cbf8db08d70f62f6a04245019488a03813c6c2084a15270f4948adfe86610980c5032afb60f282d19ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0adb13ffd7faa4295f265eb8f4032acc59af7aae9219e11391b7f75ca963ff6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe9c2f6ecbed0b059c70f2fa350d2b27605b3741fed2d8c15219072eb2708e764",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b856",
+                "balance" : "0x456391824505a506",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147aa",
+                "balance" : "0x0de0b6b3a7525afa",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json
index 8d485a1a5..8a6fc92af 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_39936_1_55201_155000_d0g0v0_EIP150" : {
+    "modexp_39936_1_55201_155000_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/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb65e",
-                    "hash" : "0xa8d104e903b7a6f669e9c4ad1bfe6c185492c80219894a397ec0018b872eaabb",
-                    "mixHash" : "0x4fbf3e34396f06758e9873e99127f1510d381053abe3a758a918011821c56df0",
-                    "nonce" : "0x16f433a46379d2d4",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x0ac8f1505f275badb44283a94e673d93d1b70f7431a3d77a5858a6ac35527c60",
+                    "mixHash" : "0x03f0f53c131e5c40235a868a1920e1ae95f8a992642d9a9a29d4aa3e2dfce321",
+                    "nonce" : "0xc73f6784554f635c",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
-                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a04fbf3e34396f06758e9873e99127f1510d381053abe3a758a918011821c56df08816f433a46379d2d4f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a003f0f53c131e5c40235a868a1920e1ae95f8a992642d9a9a29d4aa3e2dfce32188c73f6784554f635cf90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8d104e903b7a6f669e9c4ad1bfe6c185492c80219894a397ec0018b872eaabb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0ac8f1505f275badb44283a94e673d93d1b70f7431a3d77a5858a6ac35527c60",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b84c",
+                "balance" : "0x4563918244f6b856",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147b4",
+                "balance" : "0x0de0b6b3a76147aa",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_39936_1_55201_155000_d0g0v0_EIP158" : {
+    "modexp_39936_1_55201_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x53a5ceac1fb894e70e3bf39c129bdba84564b59eeba8099eccd6b9668feddd29",
+                    "mixHash" : "0x794c32899a8b92a127ad723e87413d9048d97818c8c142b92f9fdd7fb1b7a608",
+                    "nonce" : "0x6dcefd5c928f4bcd",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0794c32899a8b92a127ad723e87413d9048d97818c8c142b92f9fdd7fb1b7a608886dcefd5c928f4bcdf90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02be50",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xdc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435ae",
+                        "s" : "0x7ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defc",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x53a5ceac1fb894e70e3bf39c129bdba84564b59eeba8099eccd6b9668feddd29",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b856",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76147aa",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_39936_1_55201_155000_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/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb65e",
-                    "hash" : "0xbf306569163b83f3f36cf2e67506014dc816b9d46d91ec811246f08940ec19e1",
-                    "mixHash" : "0x72998563fb02e44fc148bc26e3b6364abd2027dafee4c1513b290d10a9db50cd",
-                    "nonce" : "0x31224a8347582516",
+                    "hash" : "0x1c235e0c6d8c7c084e7dc70aab2cff64d4637137bb8df9df9b61b0ec12cb6c4d",
+                    "mixHash" : "0x3c06aa99579f0f4d13e0405df2d96b329467fbb1679b992acdeded50cc1a97c7",
+                    "nonce" : "0x8fdad7ae84ec945d",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a072998563fb02e44fc148bc26e3b6364abd2027dafee4c1513b290d10a9db50cd8831224a8347582516f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a03c06aa99579f0f4d13e0405df2d96b329467fbb1679b992acdeded50cc1a97c7888fdad7ae84ec945df90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf306569163b83f3f36cf2e67506014dc816b9d46d91ec811246f08940ec19e1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1c235e0c6d8c7c084e7dc70aab2cff64d4637137bb8df9df9b61b0ec12cb6c4d",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_155000_d0g0v0_Frontier" : {
+    "modexp_39936_1_55201_155000_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/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02be50",
-                    "hash" : "0x80b4817c150671cb6dd7e6aea688d24a7596a9efaa1eb5c2492860010275400c",
-                    "mixHash" : "0x508845ff911a84ebf9bd747dd8b6996a62c81f90f4f9eb589b8672cdc36ecdb6",
-                    "nonce" : "0xb0e6c27b7522d167",
+                    "gasUsed" : "0xb65e",
+                    "hash" : "0x40a441b9027b39ba859b90cb1cb3d36c0e5086f8b9ef995f7747ce37f9b9aaca",
+                    "mixHash" : "0x6ff46b597537a256d690bd4510830ea1de6405bdb1610619d60bc745addeab01",
+                    "nonce" : "0x79b0542a0976f48e",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xb472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92",
-                    "stateRoot" : "0xc0feaa1cb7988d6c4a56787b9c41605942e33c017db879f7c98f0c28134c93f6",
+                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
+                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0feaa1cb7988d6c4a56787b9c41605942e33c017db879f7c98f0c28134c93f6a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0b472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302be508203e880a0508845ff911a84ebf9bd747dd8b6996a62c81f90f4f9eb589b8672cdc36ecdb688b0e6c27b7522d167f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a06ff46b597537a256d690bd4510830ea1de6405bdb1610619d60bc745addeab018879b0542a0976f48ef90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80b4817c150671cb6dd7e6aea688d24a7596a9efaa1eb5c2492860010275400c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x40a441b9027b39ba859b90cb1cb3d36c0e5086f8b9ef995f7747ce37f9b9aaca",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8c03e",
+                "balance" : "0x4563918244f6b84c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f3fc2",
+                "balance" : "0x0de0b6b3a76147b4",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_155000_d0g0v0_Homestead" : {
+    "modexp_39936_1_55201_155000_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/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02be50",
-                    "hash" : "0x5334f7c7d637981f1801a808fd2c0237e910815234adf438e104b8f39c4dd94a",
-                    "mixHash" : "0x85488ad6ade5c205cf62f2b0e3ce5581dc8b9512b20dfaf948bf45a643b2bc2a",
-                    "nonce" : "0x6329f2d35056dccb",
+                    "hash" : "0x41d78b1b1abceefd8b24eea2e4d8a9159c3bd5c8b95a2c012393d2f24d477964",
+                    "mixHash" : "0x02d27e2dcd6aed867e292b61951a363b1fa5925ed5381bb7dabe58f4c46281e9",
+                    "nonce" : "0x6bcb07d945cbaa86",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xb472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0feaa1cb7988d6c4a56787b9c41605942e33c017db879f7c98f0c28134c93f6a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0b472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302be508203e880a085488ad6ade5c205cf62f2b0e3ce5581dc8b9512b20dfaf948bf45a643b2bc2a886329f2d35056dccbf90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0feaa1cb7988d6c4a56787b9c41605942e33c017db879f7c98f0c28134c93f6a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0b472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302be508203e880a002d27e2dcd6aed867e292b61951a363b1fa5925ed5381bb7dabe58f4c46281e9886bcb07d945cbaa86f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5334f7c7d637981f1801a808fd2c0237e910815234adf438e104b8f39c4dd94a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x41d78b1b1abceefd8b24eea2e4d8a9159c3bd5c8b95a2c012393d2f24d477964",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_155000_d0g0v0_Metropolis" : {
+    "modexp_39936_1_55201_155000_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/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb668",
-                    "hash" : "0x8d86f0c8baf15462d476d74f7fafdc3d4b86f56ff0825843a504e1417c89b49a",
-                    "mixHash" : "0xbef073ceaeb1380003b22d0871511855fd2606b7e2558ccaadaa79fcf6d4df44",
-                    "nonce" : "0x696e0fcc88b160b3",
+                    "gasUsed" : "0x02be50",
+                    "hash" : "0x8dd393b9d41f10ac056a53f5c7b0ff4d1584c7f072f235a3e5a5c267f2634b1c",
+                    "mixHash" : "0xd2c116877a050e3ceb5f6a52153007dcd54a8a89d5b1e4874f9b30469eb3821d",
+                    "nonce" : "0x33d8a8faa505aaa9",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
-                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "receiptTrie" : "0xb472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92",
+                    "stateRoot" : "0xc0feaa1cb7988d6c4a56787b9c41605942e33c017db879f7c98f0c28134c93f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x97ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0bef073ceaeb1380003b22d0871511855fd2606b7e2558ccaadaa79fcf6d4df4488696e0fcc88b160b3f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
+                "rlp" : "0xf90369f901f9a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c0feaa1cb7988d6c4a56787b9c41605942e33c017db879f7c98f0c28134c93f6a097ee86d6d2d02d00c4d26fc2c5c4b92b11c1a0505d9057464a63aba553ad0c3da0b472bdf2fd228911778109823ff9f44b4cac02bca71ac61dd77e335dfd0b0a92b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302be508203e880a0d2c116877a050e3ceb5f6a52153007dcd54a8a89d5b1e4874f9b30469eb3821d8833d8a8faa505aaa9f90169f9016601018302be5094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0dc47131583137410670323c7ac50f27e75fb73f9f698063e922493a2bd9435aea07ee68c3a9a072d1b837c41e3415e216611e49bee8664f408e93b679a2102defcc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d86f0c8baf15462d476d74f7fafdc3d4b86f56ff0825843a504e1417c89b49a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8dd393b9d41f10ac056a53f5c7b0ff4d1584c7f072f235a3e5a5c267f2634b1c",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b856",
+                "balance" : "0x4563918244f8c03e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147aa",
+                "balance" : "0x0de0b6b3a75f3fc2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json
index f1a661080..58e3f1875 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_39936_1_55201_20500_d0g0v0_EIP150" : {
+    "modexp_39936_1_55201_20500_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/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb0ec",
-                    "hash" : "0x47080ec49f410298550c4b602580b80c95f819b5dcf30980255a169d36c4db59",
-                    "mixHash" : "0xe49e610f9d24506b193ff82d08a7452d0805ba9b4e535db3e7b94fdc7daef734",
-                    "nonce" : "0xf4955482fb6f49c2",
+                    "hash" : "0xed12761c7ace73d0eee67c1e8ed022cf144db701731b15794d0191e3ab4bb113",
+                    "mixHash" : "0x449dec9ccc83b86c71b8ad9e2c8dbc4584ac181cb880947247485970dba6a0e7",
+                    "nonce" : "0x385c059bfe7b6b25",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x9e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519",
-                    "stateRoot" : "0x6cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017",
+                    "receiptTrie" : "0xb26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9",
+                    "stateRoot" : "0x1132f723cb1dd9d567317b8f75fe5c58cdf86cb96c763d6c848df758d294a34b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a0e49e610f9d24506b193ff82d08a7452d0805ba9b4e535db3e7b94fdc7daef73488f4955482fb6f49c2f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01132f723cb1dd9d567317b8f75fe5c58cdf86cb96c763d6c848df758d294a34ba0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a0b26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a0449dec9ccc83b86c71b8ad9e2c8dbc4584ac181cb880947247485970dba6a0e788385c059bfe7b6b25f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47080ec49f410298550c4b602580b80c95f819b5dcf30980255a169d36c4db59",
-        "network" : "EIP150",
+        "lastblockhash" : "0xed12761c7ace73d0eee67c1e8ed022cf144db701731b15794d0191e3ab4bb113",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6b2da",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_20500_d0g0v0_EIP158" : {
+    "modexp_39936_1_55201_20500_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/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb0ec",
-                    "hash" : "0x2f788bed88674f98b0f1a02d12469e04214ed148eafc18f032af7cabf13e7079",
-                    "mixHash" : "0x98bd0e51b81244b357e4577fa148301a065acfebcceeca0849844d3ef38196f1",
-                    "nonce" : "0xf376ce4362e55913",
+                    "hash" : "0x39e21375714bcb956bb397a11be9461ada7ce0a85662a35b5c27331e39929d6f",
+                    "mixHash" : "0x80f5db1fd402cf8aad658d52d645429dcaf617926330ddada1b6fb175c3bd90e",
+                    "nonce" : "0xc2dc012cea60ee7d",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x9e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519",
-                    "stateRoot" : "0x6cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017",
+                    "receiptTrie" : "0xb26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9",
+                    "stateRoot" : "0x1132f723cb1dd9d567317b8f75fe5c58cdf86cb96c763d6c848df758d294a34b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a098bd0e51b81244b357e4577fa148301a065acfebcceeca0849844d3ef38196f188f376ce4362e55913f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01132f723cb1dd9d567317b8f75fe5c58cdf86cb96c763d6c848df758d294a34ba0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a0b26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a080f5db1fd402cf8aad658d52d645429dcaf617926330ddada1b6fb175c3bd90e88c2dc012cea60ee7df90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f788bed88674f98b0f1a02d12469e04214ed148eafc18f032af7cabf13e7079",
-        "network" : "EIP158",
+        "lastblockhash" : "0x39e21375714bcb956bb397a11be9461ada7ce0a85662a35b5c27331e39929d6f",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6b2da",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_20500_d0g0v0_Frontier" : {
+    "modexp_39936_1_55201_20500_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/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb0ec",
-                    "hash" : "0x2ec3da14b63d116c73198cef57a43e61f27693dae1ae565fcc845a4391d19caa",
-                    "mixHash" : "0xda426289f4f37d662d91d797a898cace9149615f24ce8b52e4ea46c94a4566b4",
-                    "nonce" : "0xecfdf6403c1ecb81",
+                    "hash" : "0x05d40b02b322257489456486d83f1af3ecb4b35f5d28c239b028f89eb3be787a",
+                    "mixHash" : "0xaf28ed9cfdb78ca528cd2e06700d4ea6155cf8e8815894bdd6d425bf8aac8772",
+                    "nonce" : "0x162d30988f460bda",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x9e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a0da426289f4f37d662d91d797a898cace9149615f24ce8b52e4ea46c94a4566b488ecfdf6403c1ecb81f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a0af28ed9cfdb78ca528cd2e06700d4ea6155cf8e8815894bdd6d425bf8aac877288162d30988f460bdaf90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ec3da14b63d116c73198cef57a43e61f27693dae1ae565fcc845a4391d19caa",
-        "network" : "Frontier",
+        "lastblockhash" : "0x05d40b02b322257489456486d83f1af3ecb4b35f5d28c239b028f89eb3be787a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_20500_d0g0v0_Homestead" : {
+    "modexp_39936_1_55201_20500_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/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb0ec",
-                    "hash" : "0x0a89900249b8fc6ce37c5a10f22a58cca72556101f4bcd77306199a3a17e5aea",
-                    "mixHash" : "0x74dbb31ed1a3119b363802f7d2f7d23b3a67df9ad7bb38a15f499b4b985e1f0c",
-                    "nonce" : "0xb5cf9af0826b59fb",
+                    "hash" : "0x2d2597105f33a65e4d54c1e1a5fd019b7b0c5fac4592e3f83b89ee2896417cf0",
+                    "mixHash" : "0x2d43e44b5c9f8c7d6190b1b507dc4596cae1c699c943d518d6037ffc549095a9",
+                    "nonce" : "0x4c433f229884006d",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x9e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a074dbb31ed1a3119b363802f7d2f7d23b3a67df9ad7bb38a15f499b4b985e1f0c88b5cf9af0826b59fbf90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a02d43e44b5c9f8c7d6190b1b507dc4596cae1c699c943d518d6037ffc549095a9884c433f229884006df90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a89900249b8fc6ce37c5a10f22a58cca72556101f4bcd77306199a3a17e5aea",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2d2597105f33a65e4d54c1e1a5fd019b7b0c5fac4592e3f83b89ee2896417cf0",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_20500_d0g0v0_Metropolis" : {
+    "modexp_39936_1_55201_20500_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/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb0ec",
-                    "hash" : "0x4ea87bf571bbd7ae5add754d389e2afdcb955c9453da64da4277e4a77417d68e",
-                    "mixHash" : "0x42aac94dbda57e634bae672202ea2acd83215f85eb115e706b6d477c76452a63",
-                    "nonce" : "0x68ad9d9efe0dd770",
+                    "hash" : "0xb47fddbaec6fe9befbf4606adfaf7226e5af798aafac9c367f16d06eefe9f958",
+                    "mixHash" : "0x5daac9227a0a798a7060cb0155ac1285d01c408ce5b55b3149f5cda2d833391f",
+                    "nonce" : "0x047a8063dd1f3b9f",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xb26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9",
-                    "stateRoot" : "0x1132f723cb1dd9d567317b8f75fe5c58cdf86cb96c763d6c848df758d294a34b",
+                    "receiptTrie" : "0x9e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519",
+                    "stateRoot" : "0x6cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01132f723cb1dd9d567317b8f75fe5c58cdf86cb96c763d6c848df758d294a34ba0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a0b26eef388d1a44ec4ead9c454c6424a235c8d995d778462e4ed234c55ecf0ca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a042aac94dbda57e634bae672202ea2acd83215f85eb115e706b6d477c76452a638868ad9d9efe0dd770f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a05daac9227a0a798a7060cb0155ac1285d01c408ce5b55b3149f5cda2d833391f88047a8063dd1f3b9ff90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ea87bf571bbd7ae5add754d389e2afdcb955c9453da64da4277e4a77417d68e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb47fddbaec6fe9befbf4606adfaf7226e5af798aafac9c367f16d06eefe9f958",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b2da",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7614d26",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_39936_1_55201_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb0ec",
+                    "hash" : "0x5bae07cba88dd1ac04857380028314d753f62c8ac6a108afde10f7ad0b86f939",
+                    "mixHash" : "0xb855b18048f5f6abe2e92f996f832f4fb228efcc13b743c5a9f5931a2fcbe6aa",
+                    "nonce" : "0x672446ddd50b1de5",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x9e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519",
+                    "stateRoot" : "0x6cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06cf2df1baf723480901c843d862db7069b081c98b28a7dcaac92004293da4017a0d9fc1a41d130d610076005be9701ed9c38ff39fbfa54991e2d1a6517cabe4244a09e8540ce681ebcf4e3769d41383247969499c09ab6a5c7947f7376e45d3c3519b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b0ec8203e880a0b855b18048f5f6abe2e92f996f832f4fb228efcc13b743c5a9f5931a2fcbe6aa88672446ddd50b1de5f90168f90165010182b0ec94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba0a32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5a0449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb0ec",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa32e2cf5c77dab2f09704ff130eab84eba5235dd3fa13a66bbbf1025b575b3e5",
+                        "s" : "0x449f9c516633b362c181dc2b34d7b5c02f5fcead0e285ceffc99c14b170322d0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5bae07cba88dd1ac04857380028314d753f62c8ac6a108afde10f7ad0b86f939",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json
index 2656a58d5..40e63fe60 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_39936_1_55201_22000_d0g0v0_EIP150" : {
+    "modexp_39936_1_55201_22000_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/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb65e",
-                    "hash" : "0xdc3a48dc1164493b93155669facc11e6189521c32febdb43034eff04d99e7678",
-                    "mixHash" : "0xdcf0c8b478a7153249b852e40fe66e1798cb90b7fa5486002a0c1d2deaff8fd5",
-                    "nonce" : "0x8ff83d4b5480ed1b",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x7883764d374e4a4a70d843fc9b33e72903a3382221f44bc43ff8576c2852828f",
+                    "mixHash" : "0x16812f9cd5a685e859d5f321bf8e971c070fa8398d4a9b89993bd86c4bb9b92d",
+                    "nonce" : "0xb8bddd7ad7a6e09d",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
-                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0dcf0c8b478a7153249b852e40fe66e1798cb90b7fa5486002a0c1d2deaff8fd5888ff83d4b5480ed1bf90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a016812f9cd5a685e859d5f321bf8e971c070fa8398d4a9b89993bd86c4bb9b92d88b8bddd7ad7a6e09df90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc3a48dc1164493b93155669facc11e6189521c32febdb43034eff04d99e7678",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7883764d374e4a4a70d843fc9b33e72903a3382221f44bc43ff8576c2852828f",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b84c",
+                "balance" : "0x4563918244f6b856",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147b4",
+                "balance" : "0x0de0b6b3a76147aa",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_39936_1_55201_22000_d0g0v0_EIP158" : {
+    "modexp_39936_1_55201_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0xa14ddf599e0e3effe8fff65e7d759f4936fca7dece852075f972fb654c2d8265",
+                    "mixHash" : "0x60ec9125ce1836ffa87191226c4f6c7694114212d0c58bfb606debbe99a6468e",
+                    "nonce" : "0x54c56e394557b09b",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a060ec9125ce1836ffa87191226c4f6c7694114212d0c58bfb606debbe99a6468e8854c56e394557b09bf90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb6c8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x65d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3",
+                        "s" : "0x4bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa14ddf599e0e3effe8fff65e7d759f4936fca7dece852075f972fb654c2d8265",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b856",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76147aa",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_39936_1_55201_22000_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/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb65e",
-                    "hash" : "0x6f238ab25dfaf2068fc0b1ec524c5c078e4b80dbd07463333b6a657e4b54fac7",
-                    "mixHash" : "0x6cecc2d7c2c19e8cf9c4888176f1813292514dc251178f0db41a97a4e1f65920",
-                    "nonce" : "0xd010698185402e9b",
+                    "hash" : "0x3efd42bd5eb4e8e686d77b9a353ef91cc27250e35c58cdcfa31432f7400f18ef",
+                    "mixHash" : "0xe483846597af9b8912f3d4f12d713a49cbce1419952a11bee9f506787c5b26a1",
+                    "nonce" : "0xcbeea625ab9cf075",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a06cecc2d7c2c19e8cf9c4888176f1813292514dc251178f0db41a97a4e1f6592088d010698185402e9bf90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0e483846597af9b8912f3d4f12d713a49cbce1419952a11bee9f506787c5b26a188cbeea625ab9cf075f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f238ab25dfaf2068fc0b1ec524c5c078e4b80dbd07463333b6a657e4b54fac7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3efd42bd5eb4e8e686d77b9a353ef91cc27250e35c58cdcfa31432f7400f18ef",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_22000_d0g0v0_Frontier" : {
+    "modexp_39936_1_55201_22000_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/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb6c8",
-                    "hash" : "0x592eefa46d54d96d161d419f3498ecd1404217e51c2e74d61d43ff5e83d53f28",
-                    "mixHash" : "0x1ea104cf3f417152de97b7cdd3cba8e86472bfbaeba7d7727057d6dcf2b50863",
-                    "nonce" : "0x10aee34466f1fdc2",
+                    "gasUsed" : "0xb65e",
+                    "hash" : "0x48112cb917067e986faf05fdf076015644257778f4d8219f6740fb2a898386d1",
+                    "mixHash" : "0x4f078cfadac7238a2ff6d28a8e043ef5eadbf5bec06272a2270bfc78a60dba18",
+                    "nonce" : "0x94068ccab4865124",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x6b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49e",
-                    "stateRoot" : "0x2acacc26e3610ccf991e158761a220fa3251b3adab2e29f787bd5b375ce3e64d",
+                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
+                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02acacc26e3610ccf991e158761a220fa3251b3adab2e29f787bd5b375ce3e64da09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba06b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6c88203e880a01ea104cf3f417152de97b7cdd3cba8e86472bfbaeba7d7727057d6dcf2b508638810aee34466f1fdc2f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a04f078cfadac7238a2ff6d28a8e043ef5eadbf5bec06272a2270bfc78a60dba188894068ccab4865124f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x592eefa46d54d96d161d419f3498ecd1404217e51c2e74d61d43ff5e83d53f28",
-        "network" : "Frontier",
+        "lastblockhash" : "0x48112cb917067e986faf05fdf076015644257778f4d8219f6740fb2a898386d1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b8b6",
+                "balance" : "0x4563918244f6b84c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761474a",
+                "balance" : "0x0de0b6b3a76147b4",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_22000_d0g0v0_Homestead" : {
+    "modexp_39936_1_55201_22000_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/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb6c8",
-                    "hash" : "0xb63f603cb3875ba19477b465f14d0b93c895ebb508f846b98a162ccaaf2e7ca7",
-                    "mixHash" : "0x3f5ac137b802b4e44e786f152222304a1037f5e16b082623b64a8a6c73221c6b",
-                    "nonce" : "0x0b278aa210b3b7f9",
+                    "hash" : "0xd06455f6a90fc2488c954433d4bfb6e6742cc3c6f2da088bde60adf0934dd3a3",
+                    "mixHash" : "0x8f46213f9b2552bf25d59ae5cfcdbbbaf79b575120cf1ab487460d63a9af1846",
+                    "nonce" : "0xb0efa342488f5fb1",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x6b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49e",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02acacc26e3610ccf991e158761a220fa3251b3adab2e29f787bd5b375ce3e64da09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba06b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6c88203e880a03f5ac137b802b4e44e786f152222304a1037f5e16b082623b64a8a6c73221c6b880b278aa210b3b7f9f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02acacc26e3610ccf991e158761a220fa3251b3adab2e29f787bd5b375ce3e64da09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba06b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6c88203e880a08f46213f9b2552bf25d59ae5cfcdbbbaf79b575120cf1ab487460d63a9af184688b0efa342488f5fb1f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb63f603cb3875ba19477b465f14d0b93c895ebb508f846b98a162ccaaf2e7ca7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd06455f6a90fc2488c954433d4bfb6e6742cc3c6f2da088bde60adf0934dd3a3",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_22000_d0g0v0_Metropolis" : {
+    "modexp_39936_1_55201_22000_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/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb668",
-                    "hash" : "0x04036660c7fa9464e5d5746ec7ae7fa51c89f5d529708452d27319b063493538",
-                    "mixHash" : "0xe6c16616ce608450e1b0c50d3e6647e923f56b697ad35288395345df94f31bf3",
-                    "nonce" : "0xc468524f432b8fd2",
+                    "gasUsed" : "0xb6c8",
+                    "hash" : "0x2559914e58feb7b1801c92fa9dabfcf17dd993bd92832654618ded4f69a66d23",
+                    "mixHash" : "0xf6ab03efe7da6e0cc124fddc9b00c0da440b33dc0519362d8e79aead112c158a",
+                    "nonce" : "0x7d0c4b9a790e35c4",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
-                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "receiptTrie" : "0x6b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49e",
+                    "stateRoot" : "0x2acacc26e3610ccf991e158761a220fa3251b3adab2e29f787bd5b375ce3e64d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0e6c16616ce608450e1b0c50d3e6647e923f56b697ad35288395345df94f31bf388c468524f432b8fd2f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02acacc26e3610ccf991e158761a220fa3251b3adab2e29f787bd5b375ce3e64da09b4f7dfbd131b0d2c02c533d7c6f9a0b421a9b12387763b62e53a0d5923a917ba06b9f5c68444d52c07b13a95e8caa3e919414d910ac45932355bb54dd50dac49eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6c88203e880a0f6ab03efe7da6e0cc124fddc9b00c0da440b33dc0519362d8e79aead112c158a887d0c4b9a790e35c4f90168f90165010182b6c894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ba065d3fb5f698b3e712aadd5f2c3a71a3f75d1529b106cca5678954045ffbb97e3a04bcbb2ebc699971398f882e06fb84dc9bbf5ab5cd2565a3e07d30d9db773d330c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04036660c7fa9464e5d5746ec7ae7fa51c89f5d529708452d27319b063493538",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2559914e58feb7b1801c92fa9dabfcf17dd993bd92832654618ded4f69a66d23",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b856",
+                "balance" : "0x4563918244f6b8b6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147aa",
+                "balance" : "0x0de0b6b3a761474a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json
index 612afe0b6..a9b42d853 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_39936_1_55201_25000_d0g0v0_EIP150" : {
+    "modexp_39936_1_55201_25000_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/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb65e",
-                    "hash" : "0x61b2e16495e8a8d4eaff4f9ab6bfdeeacd01a11c78fc9f8266e93f8c233ffb1b",
-                    "mixHash" : "0xb5fd0d833c2131de32f7ebdfa3cb574fe9df16b9b1c2b2bacf055674eb8c672f",
-                    "nonce" : "0x647561519f0d56ba",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x95dcce8998267f994c74bb202848aea4728e690557ea8ca9d92596a816e6f349",
+                    "mixHash" : "0xfcbc29b1a4d10db52b865c77824d22606d7a469571a88fc85f152db044107811",
+                    "nonce" : "0x3d4bcdf2e0ecc2a7",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
-                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0b5fd0d833c2131de32f7ebdfa3cb574fe9df16b9b1c2b2bacf055674eb8c672f88647561519f0d56baf90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0fcbc29b1a4d10db52b865c77824d22606d7a469571a88fc85f152db044107811883d4bcdf2e0ecc2a7f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61b2e16495e8a8d4eaff4f9ab6bfdeeacd01a11c78fc9f8266e93f8c233ffb1b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x95dcce8998267f994c74bb202848aea4728e690557ea8ca9d92596a816e6f349",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b84c",
+                "balance" : "0x4563918244f6b856",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147b4",
+                "balance" : "0x0de0b6b3a76147aa",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_39936_1_55201_25000_d0g0v0_EIP158" : {
+    "modexp_39936_1_55201_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0xf90f138a191561857f767d76892472a322d7acc56a2e816e93e4a049b12f7c90",
+                    "mixHash" : "0xe519aafc9d62e965bdeafcd9c24c0e310a08099b393ab0e550b041cab1afc766",
+                    "nonce" : "0x96e5dd5c45a66d88",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0e519aafc9d62e965bdeafcd9c24c0e310a08099b393ab0e550b041cab1afc7668896e5dd5c45a66d88f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xc280",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492b",
+                        "s" : "0x65235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf90f138a191561857f767d76892472a322d7acc56a2e816e93e4a049b12f7c90",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b856",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76147aa",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_39936_1_55201_25000_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/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb65e",
-                    "hash" : "0x5acd77e07b75b3a1a6c0c36fc571e98f0d26c97c9a9dba4f6005b6e1ed0c7ddf",
-                    "mixHash" : "0x88b48bcb7688b0fd64d647d968c1d253063cb257ed7df411a7ff7828909b6d2f",
-                    "nonce" : "0x6802a1eb13c0bf6a",
+                    "hash" : "0x58a2fb7b4cbafdb153b5514594bb423cb9a6cc3e7d0b6f9f2508fe4c19f16391",
+                    "mixHash" : "0x6bb57922db22ddbbbc7d850e55bb949217ccd199b781dea2cccd6b59a56459c3",
+                    "nonce" : "0x0ad3e17b87098fee",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a088b48bcb7688b0fd64d647d968c1d253063cb257ed7df411a7ff7828909b6d2f886802a1eb13c0bf6af90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a06bb57922db22ddbbbc7d850e55bb949217ccd199b781dea2cccd6b59a56459c3880ad3e17b87098feef90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5acd77e07b75b3a1a6c0c36fc571e98f0d26c97c9a9dba4f6005b6e1ed0c7ddf",
-        "network" : "EIP158",
+        "lastblockhash" : "0x58a2fb7b4cbafdb153b5514594bb423cb9a6cc3e7d0b6f9f2508fe4c19f16391",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_25000_d0g0v0_Frontier" : {
+    "modexp_39936_1_55201_25000_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/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc280",
-                    "hash" : "0xf08b17120e9ceecb309fd13bf18bf6360f05652fa6b5c9cd5e4ce74217b64311",
-                    "mixHash" : "0xe0f0fab5a80eb011d4d6e1f49a9cdc526854c2d5870b2c6f6f53b15cc227597c",
-                    "nonce" : "0xb6258aa1774ef2f2",
+                    "gasUsed" : "0xb65e",
+                    "hash" : "0xd5a00895b665540ee61116473dbae6ab6bee2192ab8fdbbaf15e9a9d1d3349f6",
+                    "mixHash" : "0x1da1e72247abb9b6802298fa074b83d7e12b4c57b7da7db1a9a1894ba64f2f27",
+                    "nonce" : "0xc1fb19c6e129fe0d",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48",
-                    "stateRoot" : "0x5dff110840289f0d9570a767c339b4d49b82a2824e87d96deb88e8c53142f2cd",
+                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
+                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05dff110840289f0d9570a767c339b4d49b82a2824e87d96deb88e8c53142f2cda0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2808203e880a0e0f0fab5a80eb011d4d6e1f49a9cdc526854c2d5870b2c6f6f53b15cc227597c88b6258aa1774ef2f2f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a01da1e72247abb9b6802298fa074b83d7e12b4c57b7da7db1a9a1894ba64f2f2788c1fb19c6e129fe0df90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf08b17120e9ceecb309fd13bf18bf6360f05652fa6b5c9cd5e4ce74217b64311",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd5a00895b665540ee61116473dbae6ab6bee2192ab8fdbbaf15e9a9d1d3349f6",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c46e",
+                "balance" : "0x4563918244f6b84c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613b92",
+                "balance" : "0x0de0b6b3a76147b4",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_25000_d0g0v0_Homestead" : {
+    "modexp_39936_1_55201_25000_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/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc280",
-                    "hash" : "0x3d2d2b9fd3f663e929959dac5ac823f1f4fbbd7a7ef6dabbe51b39e42b6990d8",
-                    "mixHash" : "0xb8d71468e1ec24f345108cec1d05a48ffebcd635b3cf3b6cd39318977c6c1e58",
-                    "nonce" : "0x1e28eb25e7d59724",
+                    "hash" : "0xfa909848edb0d5e95681a807e2b27a5f741251c94c0138062388d69a915a0a87",
+                    "mixHash" : "0xf1725d779e71f25598814fd6889a3b60fe58edf103760f811039b83e8a36ea24",
+                    "nonce" : "0xfaf4ba6413576565",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0x515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05dff110840289f0d9570a767c339b4d49b82a2824e87d96deb88e8c53142f2cda0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2808203e880a0b8d71468e1ec24f345108cec1d05a48ffebcd635b3cf3b6cd39318977c6c1e58881e28eb25e7d59724f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05dff110840289f0d9570a767c339b4d49b82a2824e87d96deb88e8c53142f2cda0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2808203e880a0f1725d779e71f25598814fd6889a3b60fe58edf103760f811039b83e8a36ea2488faf4ba6413576565f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d2d2b9fd3f663e929959dac5ac823f1f4fbbd7a7ef6dabbe51b39e42b6990d8",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfa909848edb0d5e95681a807e2b27a5f741251c94c0138062388d69a915a0a87",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_25000_d0g0v0_Metropolis" : {
+    "modexp_39936_1_55201_25000_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/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb668",
-                    "hash" : "0x3eecdf29fc0810794f090014a27c313a1c221b80af5c12dd68e756e620d5975f",
-                    "mixHash" : "0x412ac3281e7ef2b5fd7d59f19b393e5074b7b48ddad8fe0b5662d6f4fbe1fad3",
-                    "nonce" : "0xb8c3f1174ae25840",
+                    "gasUsed" : "0xc280",
+                    "hash" : "0x9c17bc6c688bfaaea54a6bdf6fe5e5f854cd3eca1fde9476cf212d85ed2b5bf8",
+                    "mixHash" : "0x6a098cfd3987e068b37cd72ec230b71a542378ca11132be95a907b4557fbb291",
+                    "nonce" : "0x187ecca12a6ea80d",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
-                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "receiptTrie" : "0x515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48",
+                    "stateRoot" : "0x5dff110840289f0d9570a767c339b4d49b82a2824e87d96deb88e8c53142f2cd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0412ac3281e7ef2b5fd7d59f19b393e5074b7b48ddad8fe0b5662d6f4fbe1fad388b8c3f1174ae25840f90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05dff110840289f0d9570a767c339b4d49b82a2824e87d96deb88e8c53142f2cda0ce8e41b9d02e132cff0496783078512d9b93991c0d24612636fb320eac314716a0515b087fa14354c7ad4151956bbb8180da6d94dd675fc251c17361f6b6b14f48b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2808203e880a06a098cfd3987e068b37cd72ec230b71a542378ca11132be95a907b4557fbb29188187ecca12a6ea80df90168f90165010182c28094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca05416848fc8b5ffea579588df1281c251608a54c28c91595f9fd04db63b0c492ba065235a6908604369aca58aec2283e6b8437e2967ef9781c338447f3df2089d81c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3eecdf29fc0810794f090014a27c313a1c221b80af5c12dd68e756e620d5975f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9c17bc6c688bfaaea54a6bdf6fe5e5f854cd3eca1fde9476cf212d85ed2b5bf8",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b856",
+                "balance" : "0x4563918244f6c46e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147aa",
+                "balance" : "0x0de0b6b3a7613b92",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json
index 56c82d1a4..490f764cc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_39936_1_55201_35000_d0g0v0_EIP150" : {
+    "modexp_39936_1_55201_35000_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/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb65e",
-                    "hash" : "0x9b4b23a83e4807fc88668540a6bdc5ce700525469a207591961fc059903e8288",
-                    "mixHash" : "0x62e31c886bcc6c3feb76e23a8a6cb91bbf926a5bb49d80f8638ed9a77a69be8c",
-                    "nonce" : "0x9ee4f0be02d1079b",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x29524ce232fc612bff90014724e38189bb26e060de5789794e51b6683877a336",
+                    "mixHash" : "0xf8a7a9a63c487e5e2ad5631b7e4fdb28ad1d3ed9dc17fe4c99537b3e15ac6962",
+                    "nonce" : "0xf02e70c4b7198cc4",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
-                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a062e31c886bcc6c3feb76e23a8a6cb91bbf926a5bb49d80f8638ed9a77a69be8c889ee4f0be02d1079bf90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a0f8a7a9a63c487e5e2ad5631b7e4fdb28ad1d3ed9dc17fe4c99537b3e15ac696288f02e70c4b7198cc4f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b4b23a83e4807fc88668540a6bdc5ce700525469a207591961fc059903e8288",
-        "network" : "EIP150",
+        "lastblockhash" : "0x29524ce232fc612bff90014724e38189bb26e060de5789794e51b6683877a336",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b84c",
+                "balance" : "0x4563918244f6b856",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147b4",
+                "balance" : "0x0de0b6b3a76147aa",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_39936_1_55201_35000_d0g0v0_EIP158" : {
+    "modexp_39936_1_55201_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb668",
+                    "hash" : "0x2e5e21c3a97586cfc4a5ea74f62d59e96ed8dfa1485666d6f488c80617a4ed3c",
+                    "mixHash" : "0x15549e6aa18749bea88ddf542a8887168a6ce711eb253ed925cd3098fa42b8a8",
+                    "nonce" : "0xbb4e561e52d5fb35",
+                    "number" : "0x01",
+                    "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
+                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a015549e6aa18749bea88ddf542a8887168a6ce711eb253ed925cd3098fa42b8a888bb4e561e52d5fb35f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe990",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x7e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8",
+                        "s" : "0x0d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8d",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2e5e21c3a97586cfc4a5ea74f62d59e96ed8dfa1485666d6f488c80617a4ed3c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b856",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76147aa",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_39936_1_55201_35000_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/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb65e",
-                    "hash" : "0x8213d066933b4bfe3eefcde80d2d8cffb02d93fb19768776c094b174dde98f98",
-                    "mixHash" : "0xa1a6eecde2b481511e42b6a95fefaead67c1f3c1c771bb409bd606ad884a8754",
-                    "nonce" : "0x522e4969fa506142",
+                    "hash" : "0xa4034b28bf0955b47e27e4f21582e1875e1cefab4c9d50bcef44b70eee0fa993",
+                    "mixHash" : "0xf4e2e68844cf7ac6d671988c885c21a85cb96ff7c9131a16db319e096b72d8d7",
+                    "nonce" : "0xf4ea66178a5b60b5",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0a1a6eecde2b481511e42b6a95fefaead67c1f3c1c771bb409bd606ad884a875488522e4969fa506142f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0f4e2e68844cf7ac6d671988c885c21a85cb96ff7c9131a16db319e096b72d8d788f4ea66178a5b60b5f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8213d066933b4bfe3eefcde80d2d8cffb02d93fb19768776c094b174dde98f98",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa4034b28bf0955b47e27e4f21582e1875e1cefab4c9d50bcef44b70eee0fa993",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_35000_d0g0v0_Frontier" : {
+    "modexp_39936_1_55201_35000_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/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe990",
-                    "hash" : "0x18292a463b014d74e2df00239d69820bb26b556c6cd998755f963047f9d6a2b7",
-                    "mixHash" : "0x923a172c8ec3b54471650350225158ee0e42421b89d926a09f8011e0b3365b33",
-                    "nonce" : "0x19c85cf947b64284",
+                    "gasUsed" : "0xb65e",
+                    "hash" : "0x5e0ae14ea8e173a75181d7acf92ee27cf66438f78c5c54105e04209c60143a8d",
+                    "mixHash" : "0xf8547b9d28b0ab354ef38dfe923ffb5015b28926ebb89645f87afbacc35d3616",
+                    "nonce" : "0xfd110dd02737e442",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0xc60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2",
-                    "stateRoot" : "0x2f03f6ced9cd026f81e7d80f2eca12c6d220184afa81fe50a14c51de165b020b",
+                    "receiptTrie" : "0xce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ec",
+                    "stateRoot" : "0x4f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f03f6ced9cd026f81e7d80f2eca12c6d220184afa81fe50a14c51de165b020ba0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0c60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e9908203e880a0923a172c8ec3b54471650350225158ee0e42421b89d926a09f8011e0b3365b338819c85cf947b64284f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04f031c46a10f88bf4ec90f081c85d0cb3c4ae99edfa5ee67fc994357620a3a83a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0ce396b1578d0c439748c2d65bc6045a0b035d9f9136d60ee21d0c5d1bd3559ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b65e8203e880a0f8547b9d28b0ab354ef38dfe923ffb5015b28926ebb89645f87afbacc35d361688fd110dd02737e442f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18292a463b014d74e2df00239d69820bb26b556c6cd998755f963047f9d6a2b7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5e0ae14ea8e173a75181d7acf92ee27cf66438f78c5c54105e04209c60143a8d",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6eb7e",
+                "balance" : "0x4563918244f6b84c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611482",
+                "balance" : "0x0de0b6b3a76147b4",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_35000_d0g0v0_Homestead" : {
+    "modexp_39936_1_55201_35000_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/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe990",
-                    "hash" : "0xcf7e9b0ab649a933e54db3a1b27c681619bee8f00029b0c7c9c309852fa31c2b",
-                    "mixHash" : "0x9d023586344173f1a7a8da126c8b5fd94004ed812231fc1720c35e544a903669",
-                    "nonce" : "0xf10a5912c1598875",
+                    "hash" : "0x6b07b0bf67fc9072be6f84038e5bc70170cee8d655bce63d6dc4dbc6951a3b3e",
+                    "mixHash" : "0x360d82f6d6356a72425cf9df6035eaa3cb7d98e7e887bd81e3597948c6acd0bf",
+                    "nonce" : "0x8dfbc8aeafe65ad4",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
                     "receiptTrie" : "0xc60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f03f6ced9cd026f81e7d80f2eca12c6d220184afa81fe50a14c51de165b020ba0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0c60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e9908203e880a09d023586344173f1a7a8da126c8b5fd94004ed812231fc1720c35e544a90366988f10a5912c1598875f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f03f6ced9cd026f81e7d80f2eca12c6d220184afa81fe50a14c51de165b020ba0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0c60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e9908203e880a0360d82f6d6356a72425cf9df6035eaa3cb7d98e7e887bd81e3597948c6acd0bf888dfbc8aeafe65ad4f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf7e9b0ab649a933e54db3a1b27c681619bee8f00029b0c7c9c309852fa31c2b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6b07b0bf67fc9072be6f84038e5bc70170cee8d655bce63d6dc4dbc6951a3b3e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_39936_1_55201_35000_d0g0v0_Metropolis" : {
+    "modexp_39936_1_55201_35000_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/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb668",
-                    "hash" : "0xca4273141a0ce89d05b3a9a03aa65e202b0ed7e9d0851daab46417f956ed1a56",
-                    "mixHash" : "0x8dedd65e53e2b9a6107f33f932fa9f17ac770486fbebee1458141a1bf3679191",
-                    "nonce" : "0xa226c8ca27a71706",
+                    "gasUsed" : "0xe990",
+                    "hash" : "0x85f71863156c5f1575160a2743160cbec0ec6e466ef11a1e0281a0abed945976",
+                    "mixHash" : "0xd9fb15cb8b02bd52a9a0a0f4cd9f2a38ca47afb34ce78dd72e04b05ede7a4871",
+                    "nonce" : "0xc5fc12f65a2854fe",
                     "number" : "0x01",
                     "parentHash" : "0x2e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8",
-                    "receiptTrie" : "0x2f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283",
-                    "stateRoot" : "0x5ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4",
+                    "receiptTrie" : "0xc60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2",
+                    "stateRoot" : "0x2f03f6ced9cd026f81e7d80f2eca12c6d220184afa81fe50a14c51de165b020b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05ddbd32b912379ff86d389f08081a0307dec00f23d682cecc236882f7a50f0d4a0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a02f7506429a4eb728a2a8f773d54d7ad37d561ea2bee8fb952bb35074fdcac283b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b6688203e880a08dedd65e53e2b9a6107f33f932fa9f17ac770486fbebee1458141a1bf367919188a226c8ca27a71706f90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
+                "rlp" : "0xf90367f901f8a02e337efe6e6fa6db74bfa5ce306aa6df189f4df277f90e3289235dfd964e78f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f03f6ced9cd026f81e7d80f2eca12c6d220184afa81fe50a14c51de165b020ba0b58077468a99e3c66d60f7b73d5b31bc715ffcb5e9d23c36a1b3a775df534118a0c60b970e631efe14d73a5be249a22086be43414c878ac4b8e58a234719d48fc2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e9908203e880a0d9fb15cb8b02bd52a9a0a0f4cd9f2a38ca47afb34ce78dd72e04b05ede7a487188c5fc12f65a2854fef90168f90165010182e99094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db8810000000000000000000000000000000000000000000000000000000000001ca07e9e2b33459ed3e533b7f7ad8a3c5ce577ce0e045d24778ad2ee65ac92580cf8a00d645936cd2085a1177d36ddd8a26fd198f8264ff4ba3a7bf4c3a810ff1bba8dc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f7d7a3fde4e7780dd755ad5a0468713a0ba292313010326d255bbd014f9308f4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca4273141a0ce89d05b3a9a03aa65e202b0ed7e9d0851daab46417f956ed1a56",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x85f71863156c5f1575160a2743160cbec0ec6e466ef11a1e0281a0abed945976",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b856",
+                "balance" : "0x4563918244f6eb7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76147aa",
+                "balance" : "0x0de0b6b3a7611482",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json
index 160700774..543b7c592 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_09984_39936_1000000_d0g0v0_EIP150" : {
+    "modexp_3_09984_39936_1000000_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/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xaead",
-                    "hash" : "0x110bf28628596174bd9d8e521550463e2a187e06235640cd6b42bab5e8637a88",
-                    "mixHash" : "0xb977b1467225d8b3bd8bc497efa624c353b892e2888c06ebd58d76fc1e56ac84",
-                    "nonce" : "0xb513d994289a0287",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0xb4e87189828e0865af4a93c32078e26befd803f7742c5a114d5fc1dcc8ab6029",
+                    "mixHash" : "0xdcf891da90b1f119429e25a15afeea55550c349e758e12722c530d22df425fb4",
+                    "nonce" : "0xb9132246227c3466",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
-                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a0b977b1467225d8b3bd8bc497efa624c353b892e2888c06ebd58d76fc1e56ac8488b513d994289a0287f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a0dcf891da90b1f119429e25a15afeea55550c349e758e12722c530d22df425fb488b9132246227c3466f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x110bf28628596174bd9d8e521550463e2a187e06235640cd6b42bab5e8637a88",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb4e87189828e0865af4a93c32078e26befd803f7742c5a114d5fc1dcc8ab6029",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b09b",
+                "balance" : "0x4563918244f6bb69",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f65",
+                "balance" : "0x0de0b6b3a7614497",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_09984_39936_1000000_d0g0v0_EIP158" : {
+    "modexp_3_09984_39936_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0x7ec2a3848ca76b0718de1a12161d6898a88d48152228398c7a0229bd687a9d5e",
+                    "mixHash" : "0xf5a2976fe2d31c0ef8714b956f38a2deeac2e81f49c07ccfc6075c5eeedcb5f0",
+                    "nonce" : "0x3528a07dc223d5fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a0f5a2976fe2d31c0ef8714b956f38a2deeac2e81f49c07ccfc6075c5eeedcb5f0883528a07dc223d5fef90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9b58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57c",
+                        "s" : "0x468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5a",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7ec2a3848ca76b0718de1a12161d6898a88d48152228398c7a0229bd687a9d5e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6bb69",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7614497",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_09984_39936_1000000_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/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaead",
-                    "hash" : "0x5c1b551a24cbafa0888fc7c213dd4565bd2ba533bd0646084d324f1056a9261c",
-                    "mixHash" : "0xfd1d1dc067d42ba39690975875707c84b7e254892b36641cde584fa4f2e9460a",
-                    "nonce" : "0x1d3a019d9e446777",
+                    "hash" : "0x3518a0338e6a9954e6ba14f7a970e39b4944b0b61739cc573cd7e87053e4f5ab",
+                    "mixHash" : "0x42b2c926bf9048e6297dc0b6f8cbd8a7af489395752be1af13726a324f738073",
+                    "nonce" : "0x7109e3c4133d64e2",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a0fd1d1dc067d42ba39690975875707c84b7e254892b36641cde584fa4f2e9460a881d3a019d9e446777f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a042b2c926bf9048e6297dc0b6f8cbd8a7af489395752be1af13726a324f738073887109e3c4133d64e2f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c1b551a24cbafa0888fc7c213dd4565bd2ba533bd0646084d324f1056a9261c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3518a0338e6a9954e6ba14f7a970e39b4944b0b61739cc573cd7e87053e4f5ab",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_1000000_d0g0v0_Frontier" : {
+    "modexp_3_09984_39936_1000000_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/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9b58",
-                    "hash" : "0x66088752fd4d3d11ec6d084048084ff80ab1bffabbef69b2df99fe0d85863c7c",
-                    "mixHash" : "0x975597a30ecd827af2e735da63598785b56b556d80e9989b676ec04dfe48b36f",
-                    "nonce" : "0xa82bed8c0b24d004",
+                    "gasUsed" : "0xaead",
+                    "hash" : "0x4d4b81441176842448e7fe41751e9cc10a56feded0af417f8651a476a1c0f6c5",
+                    "mixHash" : "0xe02f6f6581fad8dde737ffcf156c8dcad54008fbcaacb9be3b2b02a9c76a2e78",
+                    "nonce" : "0x60185dd9cc9191e8",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x4e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659bec",
-                    "stateRoot" : "0xf1f520d395c600069ddae5598cef834ff7bef021a42f44b3d5f0f2fecef59e0a",
+                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
+                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f1f520d395c600069ddae5598cef834ff7bef021a42f44b3d5f0f2fecef59e0aa00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea04e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659becb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9b588203e880a0975597a30ecd827af2e735da63598785b56b556d80e9989b676ec04dfe48b36f88a82bed8c0b24d004f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a0e02f6f6581fad8dde737ffcf156c8dcad54008fbcaacb9be3b2b02a9c76a2e788860185dd9cc9191e8f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66088752fd4d3d11ec6d084048084ff80ab1bffabbef69b2df99fe0d85863c7c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4d4b81441176842448e7fe41751e9cc10a56feded0af417f8651a476a1c0f6c5",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059d46",
+                "balance" : "0x4563918244f6b09b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75262ba",
+                "balance" : "0x0de0b6b3a7614f65",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_1000000_d0g0v0_Homestead" : {
+    "modexp_3_09984_39936_1000000_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/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9b58",
-                    "hash" : "0x4bf7ce4acdb13442d41d642979fdde33e2725094b4fd42bf21df619aa5c6c783",
-                    "mixHash" : "0x43bbd17d0a098d7b7d2e0bd3e608926606f89da91b635bc0fb372ecad9509bbe",
-                    "nonce" : "0x77f97af6661bf771",
+                    "hash" : "0x75da7556e49093bb5adac418a105e34becebe7053716d87d585f6592a417ae52",
+                    "mixHash" : "0xf6073a1ffe73660ec80526655cda35d5bf780d5b088ac1d0dfcf16f4bc4ca526",
+                    "nonce" : "0x574544bd892e69e4",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x4e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659bec",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f1f520d395c600069ddae5598cef834ff7bef021a42f44b3d5f0f2fecef59e0aa00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea04e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659becb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9b588203e880a043bbd17d0a098d7b7d2e0bd3e608926606f89da91b635bc0fb372ecad9509bbe8877f97af6661bf771f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f1f520d395c600069ddae5598cef834ff7bef021a42f44b3d5f0f2fecef59e0aa00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea04e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659becb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9b588203e880a0f6073a1ffe73660ec80526655cda35d5bf780d5b088ac1d0dfcf16f4bc4ca52688574544bd892e69e4f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4bf7ce4acdb13442d41d642979fdde33e2725094b4fd42bf21df619aa5c6c783",
-        "network" : "Homestead",
+        "lastblockhash" : "0x75da7556e49093bb5adac418a105e34becebe7053716d87d585f6592a417ae52",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_1000000_d0g0v0_Metropolis" : {
+    "modexp_3_09984_39936_1000000_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/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb97b",
-                    "hash" : "0x6a84bc6f5c73c5c888b89977d7b85592bf8393163811c99d684c9ba544efc088",
-                    "mixHash" : "0xd819452401e10e419ba8b556f826a8d23de4efb557b705e77e59a0a8f539abd1",
-                    "nonce" : "0x651bd6fade8c5f7b",
+                    "gasUsed" : "0x0f9b58",
+                    "hash" : "0x55f1241b27d5c6cac82126278c78219c968b3cbd4e008974ec8488451aa276f7",
+                    "mixHash" : "0x2ecbed4a7cbd23a3e8ce1f86a68a59b78af929f0529a3feb6ccc3fece9e3f35f",
+                    "nonce" : "0xf9d87e553377ac09",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
-                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "receiptTrie" : "0x4e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659bec",
+                    "stateRoot" : "0xf1f520d395c600069ddae5598cef834ff7bef021a42f44b3d5f0f2fecef59e0a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a0d819452401e10e419ba8b556f826a8d23de4efb557b705e77e59a0a8f539abd188651bd6fade8c5f7bf90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
+                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f1f520d395c600069ddae5598cef834ff7bef021a42f44b3d5f0f2fecef59e0aa00dab3e0a7eb4782a901334af75d2db2b22edc55da429cb7ae14ea82412aa5a6ea04e4f9fbae5040961100a9f3ad8f347c324b6efbd962440fb12635edd2b659becb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9b588203e880a02ecbed4a7cbd23a3e8ce1f86a68a59b78af929f0529a3feb6ccc3fece9e3f35f88f9d87e553377ac09f90169f901660101830f9b5894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0bd0a29380ab453825572e7f862d3b85be4fd1551b36fae114d849363bcaed57ca0468b9ffc4cdea29f7442d7b3446532f8f89ae6fcf6087961ce436dbde390ca5ac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a84bc6f5c73c5c888b89977d7b85592bf8393163811c99d684c9ba544efc088",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x55f1241b27d5c6cac82126278c78219c968b3cbd4e008974ec8488451aa276f7",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bb69",
+                "balance" : "0x4563918245059d46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614497",
+                "balance" : "0x0de0b6b3a75262ba",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json
index f71a17faf..72452b92f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_09984_39936_155000_d0g0v0_EIP150" : {
+    "modexp_3_09984_39936_155000_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/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xaead",
-                    "hash" : "0x27ae73b82a2c0b0d2e0f3b5457378650c9a03a2b4081c643221e51598194da44",
-                    "mixHash" : "0x9feea47bac5cec1a34d4d405df2514c7e5dfc6bab36341afdc3898f695c5902a",
-                    "nonce" : "0x68e44a451c9e40d2",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0x71caddb0999f259b806d5a714a29503d122d5705c1305d81c5cb44a79437152f",
+                    "mixHash" : "0xcab70a8680bde6225ba0dd1337c0d2e6ab31ec9ffde87dad7b6aeedeab3edb51",
+                    "nonce" : "0x5d96e31799b480b4",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
-                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a09feea47bac5cec1a34d4d405df2514c7e5dfc6bab36341afdc3898f695c5902a8868e44a451c9e40d2f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a0cab70a8680bde6225ba0dd1337c0d2e6ab31ec9ffde87dad7b6aeedeab3edb51885d96e31799b480b4f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27ae73b82a2c0b0d2e0f3b5457378650c9a03a2b4081c643221e51598194da44",
-        "network" : "EIP150",
+        "lastblockhash" : "0x71caddb0999f259b806d5a714a29503d122d5705c1305d81c5cb44a79437152f",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b09b",
+                "balance" : "0x4563918244f6bb69",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f65",
+                "balance" : "0x0de0b6b3a7614497",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_09984_39936_155000_d0g0v0_EIP158" : {
+    "modexp_3_09984_39936_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0x17a99dca408a6905564e9f96e82f9845c0b19150da8fee35582e025777470d0e",
+                    "mixHash" : "0x8377d6c2bd612b4b363b1b7ac381c00734042f0d94c47094e669afe756dc358f",
+                    "nonce" : "0x1e00751578362b63",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a08377d6c2bd612b4b363b1b7ac381c00734042f0d94c47094e669afe756dc358f881e00751578362b63f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b690",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x84c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28",
+                        "s" : "0x45ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x17a99dca408a6905564e9f96e82f9845c0b19150da8fee35582e025777470d0e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6bb69",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7614497",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_09984_39936_155000_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/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaead",
-                    "hash" : "0xa2006683f81b6ddc401a96a14fcb64a9ead7e5c6f417bf1adfb8a8100016c5b3",
-                    "mixHash" : "0x5259dd50432c6bd51755bb77140e3669eb9739a54ca3e91dc1bc18468f98f053",
-                    "nonce" : "0x305c7a0fe25cef9d",
+                    "hash" : "0xf414e52aead4711d9d4598305087869afe6ab6b35d77c23ac7e4734a0b2e5720",
+                    "mixHash" : "0x6c05a6753936d317fbd3480c12d5c516969050c63a1d83fd5bfb85fdbdafdf10",
+                    "nonce" : "0xda9f8dd8cbf3f91d",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a05259dd50432c6bd51755bb77140e3669eb9739a54ca3e91dc1bc18468f98f05388305c7a0fe25cef9df90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a06c05a6753936d317fbd3480c12d5c516969050c63a1d83fd5bfb85fdbdafdf1088da9f8dd8cbf3f91df90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2006683f81b6ddc401a96a14fcb64a9ead7e5c6f417bf1adfb8a8100016c5b3",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf414e52aead4711d9d4598305087869afe6ab6b35d77c23ac7e4734a0b2e5720",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_155000_d0g0v0_Frontier" : {
+    "modexp_3_09984_39936_155000_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/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b690",
-                    "hash" : "0xf9a500bea7131457221b496008da9db798223b4796874a35165077cbb97df4ce",
-                    "mixHash" : "0x7dc6701fe5dd0b627bd35ff3bdd9da568a30bd7cc3ef59a2b1793f902976aacb",
-                    "nonce" : "0xde684849a938b723",
+                    "gasUsed" : "0xaead",
+                    "hash" : "0x22b614eccd3bfac108ef75fd84191272c07c5bd9008b3c38d9e40d273ca98b8c",
+                    "mixHash" : "0x9366a5f39825d09bd6683abf84065f89e47360ed2f8cfd9d62dfeb4e5f5a8542",
+                    "nonce" : "0x02aa595b621e058e",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0xea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfb",
-                    "stateRoot" : "0x1cd58a3c4f5b63dbda8224e3808643a68659d25471a4c45bd935f25641e9e590",
+                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
+                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01cd58a3c4f5b63dbda8224e3808643a68659d25471a4c45bd935f25641e9e590a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a0ea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6908203e880a07dc6701fe5dd0b627bd35ff3bdd9da568a30bd7cc3ef59a2b1793f902976aacb88de684849a938b723f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a09366a5f39825d09bd6683abf84065f89e47360ed2f8cfd9d62dfeb4e5f5a85428802aa595b621e058ef90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9a500bea7131457221b496008da9db798223b4796874a35165077cbb97df4ce",
-        "network" : "Frontier",
+        "lastblockhash" : "0x22b614eccd3bfac108ef75fd84191272c07c5bd9008b3c38d9e40d273ca98b8c",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b87e",
+                "balance" : "0x4563918244f6b09b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4782",
+                "balance" : "0x0de0b6b3a7614f65",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_155000_d0g0v0_Homestead" : {
+    "modexp_3_09984_39936_155000_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/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b690",
-                    "hash" : "0x5a86d045c6d28cdd7bfcdce4314f3630f1b87847f09c21a22c9ecc90a5e4ab54",
-                    "mixHash" : "0x385a77eafe3196e91cf2c733aa7bbb00effee8bacdd6dfea2c9c650b120f8f25",
-                    "nonce" : "0xb003d9b61448a04d",
+                    "hash" : "0xcf56adb1c6247fbcc58b7c9434aab870d436181a89ca0867a46fc4081ad93f28",
+                    "mixHash" : "0x801a0c8a8ec88bf87d586c44efc2b951bf08bdcc25b9fe68d65acf66292528ea",
+                    "nonce" : "0xf4b9842ab69bf061",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfb",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01cd58a3c4f5b63dbda8224e3808643a68659d25471a4c45bd935f25641e9e590a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a0ea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6908203e880a0385a77eafe3196e91cf2c733aa7bbb00effee8bacdd6dfea2c9c650b120f8f2588b003d9b61448a04df90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01cd58a3c4f5b63dbda8224e3808643a68659d25471a4c45bd935f25641e9e590a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a0ea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6908203e880a0801a0c8a8ec88bf87d586c44efc2b951bf08bdcc25b9fe68d65acf66292528ea88f4b9842ab69bf061f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a86d045c6d28cdd7bfcdce4314f3630f1b87847f09c21a22c9ecc90a5e4ab54",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcf56adb1c6247fbcc58b7c9434aab870d436181a89ca0867a46fc4081ad93f28",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_155000_d0g0v0_Metropolis" : {
+    "modexp_3_09984_39936_155000_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/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb97b",
-                    "hash" : "0x4fb8314546b08f82733be221f3cf900eaf2c606a707b9a191e328e07cfc34e89",
-                    "mixHash" : "0x58f058047356e9886bbaad54ddb57d5010e8e88b37dbc30d52ba9fee6a8628f3",
-                    "nonce" : "0x08eb6841374a9f98",
+                    "gasUsed" : "0x02b690",
+                    "hash" : "0x535c9c14378f79c1ec7d1b7d5905fdeaad85314bec7aef063e7e893fa16d5e45",
+                    "mixHash" : "0xe589d444966257880285a4d4bd8c863b4ca08408df5d25bcba8ee9665a1a6c62",
+                    "nonce" : "0x0141d3345998bbc2",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
-                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "receiptTrie" : "0xea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfb",
+                    "stateRoot" : "0x1cd58a3c4f5b63dbda8224e3808643a68659d25471a4c45bd935f25641e9e590",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a058f058047356e9886bbaad54ddb57d5010e8e88b37dbc30d52ba9fee6a8628f38808eb6841374a9f98f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
+                "rlp" : "0xf90369f901f9a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01cd58a3c4f5b63dbda8224e3808643a68659d25471a4c45bd935f25641e9e590a0d83dd57ff8467700ac5b72159c59c962b39702a9fc03371bc04a80dae226c9b0a0ea7b599acd388c06ad45a941e521122aa017b65d06dc6f161226d99633992cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6908203e880a0e589d444966257880285a4d4bd8c863b4ca08408df5d25bcba8ee9665a1a6c62880141d3345998bbc2f90169f9016601018302b69094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca084c0f2200d064ab53f64939d26d7c06dc789d6774f18788bfb25bceb57475f28a045ff7923eb13789828ff6a83d85f77361ca866e0bc4ac90d9c791112fb040389c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4fb8314546b08f82733be221f3cf900eaf2c606a707b9a191e328e07cfc34e89",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x535c9c14378f79c1ec7d1b7d5905fdeaad85314bec7aef063e7e893fa16d5e45",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bb69",
+                "balance" : "0x4563918244f8b87e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614497",
+                "balance" : "0x0de0b6b3a75f4782",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json
index 75b87a152..c97865afa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_09984_39936_22000_d0g0v0_EIP150" : {
+    "modexp_3_09984_39936_22000_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/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xaead",
-                    "hash" : "0x6be05f7833c274c7f5ee14265fbc5077adcd2cc67448feb5f1a8e0c2b3a51e83",
-                    "mixHash" : "0x9701b865c50e8f3331c3a4c3a07723160bd152cb8be90218b4aeb8814f62fd72",
-                    "nonce" : "0xea191abdf261b450",
+                    "gasUsed" : "0xaf08",
+                    "hash" : "0xa158d649db516f545224f6543d4eaa58e9a6f9503e0a7c306d055a6d9a7a7353",
+                    "mixHash" : "0x09d88dbafc13280fe36da57e0aa2a495080e8c99070c7ba878839dc43f2c810a",
+                    "nonce" : "0x1dcea5a0bd9a782c",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
-                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
+                    "receiptTrie" : "0x0ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712",
+                    "stateRoot" : "0x916486d97242a6c1e9918b3207e5a47305636556e8a694371b985f4a8c78d683",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a09701b865c50e8f3331c3a4c3a07723160bd152cb8be90218b4aeb8814f62fd7288ea191abdf261b450f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0916486d97242a6c1e9918b3207e5a47305636556e8a694371b985f4a8c78d683a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a00ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a009d88dbafc13280fe36da57e0aa2a495080e8c99070c7ba878839dc43f2c810a881dcea5a0bd9a782cf90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6be05f7833c274c7f5ee14265fbc5077adcd2cc67448feb5f1a8e0c2b3a51e83",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa158d649db516f545224f6543d4eaa58e9a6f9503e0a7c306d055a6d9a7a7353",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b09b",
+                "balance" : "0x4563918244f6b0f6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f65",
+                "balance" : "0x0de0b6b3a7614f0a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_3_09984_39936_22000_d0g0v0_EIP158" : {
+    "modexp_3_09984_39936_22000_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/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xaf08",
+                    "hash" : "0x020ef4ec86e9928982872435a2e9dd4a7cccea2ba9fdfe663c2c47ec2ffd9a5a",
+                    "mixHash" : "0x9b8d563808151200d9678b6c0d15053b1042901b9367f33ef611e98a28070471",
+                    "nonce" : "0x0dbd2e115801d0fc",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0x0ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712",
+                    "stateRoot" : "0x916486d97242a6c1e9918b3207e5a47305636556e8a694371b985f4a8c78d683",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0916486d97242a6c1e9918b3207e5a47305636556e8a694371b985f4a8c78d683a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a00ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a09b8d563808151200d9678b6c0d15053b1042901b9367f33ef611e98a28070471880dbd2e115801d0fcf90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xaf08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xc07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9",
+                        "s" : "0x77e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfe",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x020ef4ec86e9928982872435a2e9dd4a7cccea2ba9fdfe663c2c47ec2ffd9a5a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6b0f6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7614f0a",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_09984_39936_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaead",
-                    "hash" : "0x232f8d93f657bd892851c33c1002fb8e24b3b738a015b8d91b422b7e4ea42a40",
-                    "mixHash" : "0x2f5de5b141fb5c612a033968c8863fb60c30f01c7f9bd0c4ee3db46591dfa496",
-                    "nonce" : "0xd82a93859552a61f",
+                    "hash" : "0x1e3a4895ca1b7a22b3d13d019165f67a21c17a1c374ea5d016d7ab88117f6e02",
+                    "mixHash" : "0xa618669af1ae918881ef093a8009043d2ae3985980b5ce39448cbdc3eb7a6b7c",
+                    "nonce" : "0x88fa6b5fd22c2c41",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a02f5de5b141fb5c612a033968c8863fb60c30f01c7f9bd0c4ee3db46591dfa49688d82a93859552a61ff90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a0a618669af1ae918881ef093a8009043d2ae3985980b5ce39448cbdc3eb7a6b7c8888fa6b5fd22c2c41f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x232f8d93f657bd892851c33c1002fb8e24b3b738a015b8d91b422b7e4ea42a40",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1e3a4895ca1b7a22b3d13d019165f67a21c17a1c374ea5d016d7ab88117f6e02",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_22000_d0g0v0_Frontier" : {
+    "modexp_3_09984_39936_22000_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/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xaf08",
-                    "hash" : "0xb05e64984b83f7738710eb86e49d308e55a1748472ede10672638ba566380492",
-                    "mixHash" : "0x2063d6e32eec86e7ad3ab92d7b1341ce284498c99eeb254f52d6238403613d72",
-                    "nonce" : "0x012723e6f0102910",
+                    "gasUsed" : "0xaead",
+                    "hash" : "0xbb09ce6ece44c67399f44ce9201bc0f6e037d46c44942a85a71724ab57abc03b",
+                    "mixHash" : "0x7d4559c916a76ccccdbb6cc577a381ed512f9481cdc746e5c6c4ccb1de9d069b",
+                    "nonce" : "0xdf6664e4fa03b812",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0xbde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663",
-                    "stateRoot" : "0xc758240a58782f461d53ff87ecffcfe536d2d494c701ee06f369d66d535e6102",
+                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
+                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c758240a58782f461d53ff87ecffcfe536d2d494c701ee06f369d66d535e6102a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a0bde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a02063d6e32eec86e7ad3ab92d7b1341ce284498c99eeb254f52d6238403613d7288012723e6f0102910f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a07d4559c916a76ccccdbb6cc577a381ed512f9481cdc746e5c6c4ccb1de9d069b88df6664e4fa03b812f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb05e64984b83f7738710eb86e49d308e55a1748472ede10672638ba566380492",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbb09ce6ece44c67399f44ce9201bc0f6e037d46c44942a85a71724ab57abc03b",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b0f6",
+                "balance" : "0x4563918244f6b09b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f0a",
+                "balance" : "0x0de0b6b3a7614f65",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_22000_d0g0v0_Homestead" : {
+    "modexp_3_09984_39936_22000_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/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaf08",
-                    "hash" : "0xc3cab76b148ed2a656535a760b09d6820ab6510057a20bec10ddefa24dbbcff7",
-                    "mixHash" : "0x66c6a5147ebcd121e975860c603bc2937a4ba8b2b4fed3709c207d240f1ed61e",
-                    "nonce" : "0xab73e3d61a97d472",
+                    "hash" : "0xa09cd9b538adfb4cf41657b03c8664a0fb1d15e037f70f7e1a7c19da14d36b9a",
+                    "mixHash" : "0xa98cee486f16d97dbe6d696ed2a9d86c27b34a2f380b0a92a6da85073d742ec7",
+                    "nonce" : "0x4b825ca5b36f1417",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xbde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c758240a58782f461d53ff87ecffcfe536d2d494c701ee06f369d66d535e6102a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a0bde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a066c6a5147ebcd121e975860c603bc2937a4ba8b2b4fed3709c207d240f1ed61e88ab73e3d61a97d472f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c758240a58782f461d53ff87ecffcfe536d2d494c701ee06f369d66d535e6102a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a0bde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a0a98cee486f16d97dbe6d696ed2a9d86c27b34a2f380b0a92a6da85073d742ec7884b825ca5b36f1417f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc3cab76b148ed2a656535a760b09d6820ab6510057a20bec10ddefa24dbbcff7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa09cd9b538adfb4cf41657b03c8664a0fb1d15e037f70f7e1a7c19da14d36b9a",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_22000_d0g0v0_Metropolis" : {
+    "modexp_3_09984_39936_22000_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/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaf08",
-                    "hash" : "0xeef0d3444cf571c760c48fabd1125e8c680b9706160b9b9cf781b4ca6cc4b10e",
-                    "mixHash" : "0x714761295f58816d2a140a3f85a86beb2a117c020ba69d9f79c1e26c2bc16be3",
-                    "nonce" : "0x532d48b1e6b76c50",
+                    "hash" : "0x6540fa772bf53155108282d56a5acea4152f05b8b649f73a4568256deedf73ba",
+                    "mixHash" : "0x358e7a0fdae1f861d26652102cb78adae36ad6189690d8e73fd051ea40a8dd92",
+                    "nonce" : "0x2f8ddaaafc844652",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x0ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712",
-                    "stateRoot" : "0x916486d97242a6c1e9918b3207e5a47305636556e8a694371b985f4a8c78d683",
+                    "receiptTrie" : "0xbde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663",
+                    "stateRoot" : "0xc758240a58782f461d53ff87ecffcfe536d2d494c701ee06f369d66d535e6102",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0916486d97242a6c1e9918b3207e5a47305636556e8a694371b985f4a8c78d683a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a00ae518abb0092c57b64d3d2b49880f6fd813e538e5497064f5f0a67ef84bf712b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a0714761295f58816d2a140a3f85a86beb2a117c020ba69d9f79c1e26c2bc16be388532d48b1e6b76c50f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c758240a58782f461d53ff87ecffcfe536d2d494c701ee06f369d66d535e6102a07b8ca1948accef9f7f335087feb4007b23cd2a31f31df4e83d6baaba3b2e4215a0bde3532ce2bb7ef492908a349463789b95f3c17a3942b068970bed0cd2bcd663b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082af088203e880a0358e7a0fdae1f861d26652102cb78adae36ad6189690d8e73fd051ea40a8dd92882f8ddaaafc844652f90168f90165010182af0894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0c07ec05012d2d78ee4b7dcee6c1c865ca7d585ee103bc3c1bc57d90a3a29d9c9a077e4aa3e98b28af1576e2792ef6dbeea0a2200ee72b7eefe6f8fa3d7349afdfec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeef0d3444cf571c760c48fabd1125e8c680b9706160b9b9cf781b4ca6cc4b10e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6540fa772bf53155108282d56a5acea4152f05b8b649f73a4568256deedf73ba",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6b0f6",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json
index 950acaf04..0221d9c04 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_09984_39936_25000_d0g0v0_EIP150" : {
+    "modexp_3_09984_39936_25000_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/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xaead",
-                    "hash" : "0xdd0215d62f10715cae8d17614f318160b72c74072179e9fa0e692840c8ea4e11",
-                    "mixHash" : "0xfea662053916ac742fbc5a420ed95dd397e98f27ef2b1dff56337192c51581bf",
-                    "nonce" : "0x39185ebe6f32b6ac",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0x4a36601ef2a2b9289ab62d0ee00ad80067e023296f7da6512a458402a396dbd2",
+                    "mixHash" : "0x313d91a66eba142261e12acb27fb1a0a4236dc389587b4b9860182389f0d46d8",
+                    "nonce" : "0x13a26b62963001d6",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
-                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a0fea662053916ac742fbc5a420ed95dd397e98f27ef2b1dff56337192c51581bf8839185ebe6f32b6acf90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a0313d91a66eba142261e12acb27fb1a0a4236dc389587b4b9860182389f0d46d88813a26b62963001d6f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd0215d62f10715cae8d17614f318160b72c74072179e9fa0e692840c8ea4e11",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4a36601ef2a2b9289ab62d0ee00ad80067e023296f7da6512a458402a396dbd2",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b09b",
+                "balance" : "0x4563918244f6bb69",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f65",
+                "balance" : "0x0de0b6b3a7614497",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_09984_39936_25000_d0g0v0_EIP158" : {
+    "modexp_3_09984_39936_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0x0d45eee7e95456bf21de2d27013b5330cdcd2e4d5d0f0662efa49dc06ef2d8ff",
+                    "mixHash" : "0x3a0fd769b2416d7c15cdb1ac4f589de2a8e328b813ac04df183660256275b9c4",
+                    "nonce" : "0xe893899a1579afb0",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a03a0fd769b2416d7c15cdb1ac4f589de2a8e328b813ac04df183660256275b9c488e893899a1579afb0f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xbac0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862e",
+                        "s" : "0x421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0d45eee7e95456bf21de2d27013b5330cdcd2e4d5d0f0662efa49dc06ef2d8ff",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6bb69",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7614497",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_09984_39936_25000_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/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaead",
-                    "hash" : "0xe33d97d9f894b38d8bebed1cea1bb569a21384feedeceac0c2457a86abb6d3f4",
-                    "mixHash" : "0x2167ecf66e10c0f5a2a84ae487d1242c4a6a0ee3124415886bb1f0dcf0324657",
-                    "nonce" : "0x0d346cf48c7dccb9",
+                    "hash" : "0xf3327891e95ef0017f3ac3f112e81c2f5fbaca020e9fb05ba671ee3de9ff8074",
+                    "mixHash" : "0x17bbed6810424c96cb61508c568434c75e55f8fa2b2a351c5a5e45493574d44b",
+                    "nonce" : "0x7149a2b7d629ff37",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a02167ecf66e10c0f5a2a84ae487d1242c4a6a0ee3124415886bb1f0dcf0324657880d346cf48c7dccb9f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a017bbed6810424c96cb61508c568434c75e55f8fa2b2a351c5a5e45493574d44b887149a2b7d629ff37f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe33d97d9f894b38d8bebed1cea1bb569a21384feedeceac0c2457a86abb6d3f4",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf3327891e95ef0017f3ac3f112e81c2f5fbaca020e9fb05ba671ee3de9ff8074",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_25000_d0g0v0_Frontier" : {
+    "modexp_3_09984_39936_25000_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/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xbac0",
-                    "hash" : "0x57f3b77dd74174fdb33a6dc83c134c1ba9f55624527b7448246c2f51ae6cbbde",
-                    "mixHash" : "0x6de920b1fdbb8a9cc7314a8198f31c8251b85e5340988a25c05a345fcd7acdb1",
-                    "nonce" : "0x1cd7a4b7b793cbed",
+                    "gasUsed" : "0xaead",
+                    "hash" : "0x6ae56efe3e38a3153e3edb350f4459e2614ca4c30dc140e45c60bd95f0704e2b",
+                    "mixHash" : "0x24faaad01fceba4eeb00c969f4da28b7af17e4c3a26719f8abba33e194c6faec",
+                    "nonce" : "0x7710781e60b4c8e3",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0xee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694d",
-                    "stateRoot" : "0x73b062a60076551d3abbc30e9ab67987dd454580cfdae7072500a7307d8cfa6f",
+                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
+                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073b062a60076551d3abbc30e9ab67987dd454580cfdae7072500a7307d8cfa6fa010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea0ee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bac08203e880a06de920b1fdbb8a9cc7314a8198f31c8251b85e5340988a25c05a345fcd7acdb1881cd7a4b7b793cbedf90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a024faaad01fceba4eeb00c969f4da28b7af17e4c3a26719f8abba33e194c6faec887710781e60b4c8e3f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57f3b77dd74174fdb33a6dc83c134c1ba9f55624527b7448246c2f51ae6cbbde",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6ae56efe3e38a3153e3edb350f4459e2614ca4c30dc140e45c60bd95f0704e2b",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bcae",
+                "balance" : "0x4563918244f6b09b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614352",
+                "balance" : "0x0de0b6b3a7614f65",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_25000_d0g0v0_Homestead" : {
+    "modexp_3_09984_39936_25000_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/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbac0",
-                    "hash" : "0xd016c49045ea95a9975276d9f2499141b3c532ad4cb4e68ac9956b1d67a46f32",
-                    "mixHash" : "0x06a281410e1e0cf37a7502e5b20858f8edca90435abb3caafdf87111e7314a37",
-                    "nonce" : "0x84bffc53fa6db40f",
+                    "hash" : "0x4c08e64d734e0aa27c891c4c59d580774707a0ccd36afa6dca14656fadcb9f01",
+                    "mixHash" : "0x33235df7029cea0672fd12063767716e96c082a8f6d4ca90f2a04e9c189ef0ea",
+                    "nonce" : "0xdccd29239b9336d5",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694d",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073b062a60076551d3abbc30e9ab67987dd454580cfdae7072500a7307d8cfa6fa010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea0ee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bac08203e880a006a281410e1e0cf37a7502e5b20858f8edca90435abb3caafdf87111e7314a378884bffc53fa6db40ff90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073b062a60076551d3abbc30e9ab67987dd454580cfdae7072500a7307d8cfa6fa010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea0ee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bac08203e880a033235df7029cea0672fd12063767716e96c082a8f6d4ca90f2a04e9c189ef0ea88dccd29239b9336d5f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd016c49045ea95a9975276d9f2499141b3c532ad4cb4e68ac9956b1d67a46f32",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4c08e64d734e0aa27c891c4c59d580774707a0ccd36afa6dca14656fadcb9f01",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_25000_d0g0v0_Metropolis" : {
+    "modexp_3_09984_39936_25000_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/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb97b",
-                    "hash" : "0xdb1d2e1ed5d5f618b18882f4d32a62d5cc282eb995b3fc4944ddf065396dec78",
-                    "mixHash" : "0x1312469c53324ee99cfb63e30011d16a8f848c2a765944a54571d81423a83dbf",
-                    "nonce" : "0x88d3d5b8362e8548",
+                    "gasUsed" : "0xbac0",
+                    "hash" : "0x9a63672ae4dcb951eede07cf8e23d4d6347e5aa929d7eebaa72df116af91eb50",
+                    "mixHash" : "0xedbfb2977848c2d696a501900c67dad71bc84475f36899082c5c40927d99e789",
+                    "nonce" : "0xaa43be1f13d07886",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
-                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "receiptTrie" : "0xee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694d",
+                    "stateRoot" : "0x73b062a60076551d3abbc30e9ab67987dd454580cfdae7072500a7307d8cfa6f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x10366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a01312469c53324ee99cfb63e30011d16a8f848c2a765944a54571d81423a83dbf8888d3d5b8362e8548f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a073b062a60076551d3abbc30e9ab67987dd454580cfdae7072500a7307d8cfa6fa010366c19b0c7ff5ffecf2f2eff44d4869034885d27192db5a97128dc75f5771ea0ee97a051bb5ee2b3c7b4ef6dec51f4631bbaabd74972aa25bf15608cd079694db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bac08203e880a0edbfb2977848c2d696a501900c67dad71bc84475f36899082c5c40927d99e78988aa43be1f13d07886f90168f90165010182bac094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0ad1a437ac26e4a55b2cc07cc40a02418187e2ae0b6bb78c2e231ab434958862ea0421d568484879ae0254d42d6a6e54ee3bfecc803ee71f68899aa1e5b240322b1c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb1d2e1ed5d5f618b18882f4d32a62d5cc282eb995b3fc4944ddf065396dec78",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9a63672ae4dcb951eede07cf8e23d4d6347e5aa929d7eebaa72df116af91eb50",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bb69",
+                "balance" : "0x4563918244f6bcae",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614497",
+                "balance" : "0x0de0b6b3a7614352",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json
index 98607801b..92e426501 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_09984_39936_35000_d0g0v0_EIP150" : {
+    "modexp_3_09984_39936_35000_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/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xaead",
-                    "hash" : "0x115bd6624f8e72f7cecc6c17e2fcefa395c8178dde0eaed520e9bb7db22bfc02",
-                    "mixHash" : "0x3f3496c0281d755ef5ad1a6d1710fbeae974daa514099c3c34c7a29acd883836",
-                    "nonce" : "0x5f12e00303578f70",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0xcf37ab03e761d321d2420a9573cc8f142fc20b8bdb114a95d4e3f25b0654252f",
+                    "mixHash" : "0x381baae2de9f7001365b2e458f4520ec445a64a8c5252b537978a60133ff319c",
+                    "nonce" : "0x2e2b51b397a9dc63",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
-                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a03f3496c0281d755ef5ad1a6d1710fbeae974daa514099c3c34c7a29acd883836885f12e00303578f70f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a0381baae2de9f7001365b2e458f4520ec445a64a8c5252b537978a60133ff319c882e2b51b397a9dc63f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x115bd6624f8e72f7cecc6c17e2fcefa395c8178dde0eaed520e9bb7db22bfc02",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcf37ab03e761d321d2420a9573cc8f142fc20b8bdb114a95d4e3f25b0654252f",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b09b",
+                "balance" : "0x4563918244f6bb69",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f65",
+                "balance" : "0x0de0b6b3a7614497",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_09984_39936_35000_d0g0v0_EIP158" : {
+    "modexp_3_09984_39936_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xb97b",
+                    "hash" : "0xa417b680685189b3708b17d51259bd2fa9eea0ff5a40a42e0161adfd03d7e32f",
+                    "mixHash" : "0x8efface398406299de94f3b92818750dc0f8322cd6d0f5bac3f79868d1e9d5a4",
+                    "nonce" : "0xaf40274e9b93fa32",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
+                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a08efface398406299de94f3b92818750dc0f8322cd6d0f5bac3f79868d1e9d5a488af40274e9b93fa32f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe1d0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x90aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756",
+                        "s" : "0x25420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa417b680685189b3708b17d51259bd2fa9eea0ff5a40a42e0161adfd03d7e32f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6bb69",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7614497",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_09984_39936_35000_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/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xaead",
-                    "hash" : "0x4804b25790b93affabdb43ae673e55e3be524ebe309c7539978d89da7a37154d",
-                    "mixHash" : "0x8214a6fb34617743c4f23dfaf77899a0c078d6310ea4759caa009d01a6f407e9",
-                    "nonce" : "0x3ae1af77d8628deb",
+                    "hash" : "0x3e0d5ec8073d65f37b8b56f2853807288a27c3d40d233d33364db04244a3b99f",
+                    "mixHash" : "0x4ada9acad3c0fedbd9fec4ca7817d5b52d10f3b4ac2e35a63092e851f6a7fe97",
+                    "nonce" : "0x22128c9fe37aa1be",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a08214a6fb34617743c4f23dfaf77899a0c078d6310ea4759caa009d01a6f407e9883ae1af77d8628debf90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a04ada9acad3c0fedbd9fec4ca7817d5b52d10f3b4ac2e35a63092e851f6a7fe978822128c9fe37aa1bef90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4804b25790b93affabdb43ae673e55e3be524ebe309c7539978d89da7a37154d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3e0d5ec8073d65f37b8b56f2853807288a27c3d40d233d33364db04244a3b99f",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_35000_d0g0v0_Frontier" : {
+    "modexp_3_09984_39936_35000_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/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe1d0",
-                    "hash" : "0x26ef0e3d302e852d1d1d8a4f388bfc9d93935d2be17cb9c78a5980b4f002f6aa",
-                    "mixHash" : "0xcae58cbc2fe12fe8889975fbdae25a9d8611302186b5cd706755cc6be0e6419d",
-                    "nonce" : "0x9a814fb98aa816fc",
+                    "gasUsed" : "0xaead",
+                    "hash" : "0xc01c297f1f861a4aeb8fe9cedd4f5f0c082e66372e8e0ca8f223a319eb8e6bea",
+                    "mixHash" : "0x3ebe907f358b77e8987a74358b45b4ebca15c29a95c95bf1ccd7609d86174804",
+                    "nonce" : "0xafff8c50e042c92a",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0xc63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79b",
-                    "stateRoot" : "0x5b703d4314cbc0fb38fe8f7829fbfb703141df1df5d9dd6b0e992ca6abc44ff7",
+                    "receiptTrie" : "0x35f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286b",
+                    "stateRoot" : "0xb634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05b703d4314cbc0fb38fe8f7829fbfb703141df1df5d9dd6b0e992ca6abc44ff7a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a0c63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1d08203e880a0cae58cbc2fe12fe8889975fbdae25a9d8611302186b5cd706755cc6be0e6419d889a814fb98aa816fcf90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b634ffa041fd317d287eaede1acadb85bacfa16874b2a8d19d748e4687d37f51a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a035f0a0347b8249d0f3fe1a787d79d842bfb68d480fd6600a003b03e9b5fd286bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082aead8203e880a03ebe907f358b77e8987a74358b45b4ebca15c29a95c95bf1ccd7609d8617480488afff8c50e042c92af90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26ef0e3d302e852d1d1d8a4f388bfc9d93935d2be17cb9c78a5980b4f002f6aa",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc01c297f1f861a4aeb8fe9cedd4f5f0c082e66372e8e0ca8f223a319eb8e6bea",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e3be",
+                "balance" : "0x4563918244f6b09b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611c42",
+                "balance" : "0x0de0b6b3a7614f65",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_35000_d0g0v0_Homestead" : {
+    "modexp_3_09984_39936_35000_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/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe1d0",
-                    "hash" : "0xd113d81fd9a1ca22379dc6d64fe699483d55574c19acc12b754e307c13c4bec9",
-                    "mixHash" : "0x682328796e4cfad744f01075c8f11b207d71ec608c890a93d587e9da654ab244",
-                    "nonce" : "0xf05d37f820eff543",
+                    "hash" : "0x63ccd23e82b9491a281142db99a59235d2282f8d230ae3552b3585c8b7783a32",
+                    "mixHash" : "0x826d4fc7aff4a9e517348fbf1c36c096da2736d5f751b486e7096a07babe8c54",
+                    "nonce" : "0x3bdacc3b5210e8f2",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0xc63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79b",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05b703d4314cbc0fb38fe8f7829fbfb703141df1df5d9dd6b0e992ca6abc44ff7a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a0c63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1d08203e880a0682328796e4cfad744f01075c8f11b207d71ec608c890a93d587e9da654ab24488f05d37f820eff543f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05b703d4314cbc0fb38fe8f7829fbfb703141df1df5d9dd6b0e992ca6abc44ff7a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a0c63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1d08203e880a0826d4fc7aff4a9e517348fbf1c36c096da2736d5f751b486e7096a07babe8c54883bdacc3b5210e8f2f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd113d81fd9a1ca22379dc6d64fe699483d55574c19acc12b754e307c13c4bec9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x63ccd23e82b9491a281142db99a59235d2282f8d230ae3552b3585c8b7783a32",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_09984_39936_35000_d0g0v0_Metropolis" : {
+    "modexp_3_09984_39936_35000_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/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb97b",
-                    "hash" : "0xab7f7d795004bd570f066e24a218a2f9e0b8a70db772c71b4332f760f58a3533",
-                    "mixHash" : "0x0929822a1d120ad16342f1f90db8ed1b65efc0dd4bb40da74f5648b3af8fb4dd",
-                    "nonce" : "0x758f7bb0615fa559",
+                    "gasUsed" : "0xe1d0",
+                    "hash" : "0xbfff4d16fd92ec553c0a7a7b4f8b4b78bf40f660c8300f124825f12089f1f68b",
+                    "mixHash" : "0x9406411d67cfa6189d3bdf0a8307c12e56f0cd3ead3876a638ad9eafc240402d",
+                    "nonce" : "0x37038ea44d6ee288",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x85b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3",
-                    "stateRoot" : "0x1c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341e",
+                    "receiptTrie" : "0xc63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79b",
+                    "stateRoot" : "0x5b703d4314cbc0fb38fe8f7829fbfb703141df1df5d9dd6b0e992ca6abc44ff7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01c8b807edc07578983ae16dcbfd591e1b6401550045885e721b05815d429341ea03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a085b5a71892c7551fb436b20b878e91d07611eac207365cc0c120aeb52f369ad3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b97b8203e880a00929822a1d120ad16342f1f90db8ed1b65efc0dd4bb40da74f5648b3af8fb4dd88758f7bb0615fa559f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a05b703d4314cbc0fb38fe8f7829fbfb703141df1df5d9dd6b0e992ca6abc44ff7a03aaba4a3b519bfc6c52507814278fcb30e7b03cc0ee9a59874608c56c0eb5331a0c63d0d8c45f309142d57e3147f6e2e7db93f7389234b41c4ec976fa958eda79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1d08203e880a09406411d67cfa6189d3bdf0a8307c12e56f0cd3ead3876a638ad9eafc240402d8837038ea44d6ee288f90168f90165010182e1d094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba090aafbd541d8b1468ee4cae4401f1cd47c44a18967813b8407aebeeaea7f8756a025420ed16ae77eb403c008608532ff99dff1c7e8ac178a8fd5157e8392bb0fd0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab7f7d795004bd570f066e24a218a2f9e0b8a70db772c71b4332f760f58a3533",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbfff4d16fd92ec553c0a7a7b4f8b4b78bf40f660c8300f124825f12089f1f68b",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bb69",
+                "balance" : "0x4563918244f6e3be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614497",
+                "balance" : "0x0de0b6b3a7611c42",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json
index a297fd748..8981e9460 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_28948_11579_20500_d0g0v0_EIP150" : {
+    "modexp_3_28948_11579_20500_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/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa92c",
-                    "hash" : "0x8ebbdb194e6c178687f50f26be3f26c5992436f499b8042abcd5fa04c385f35a",
-                    "mixHash" : "0x4b4009ddd11ba4ec54a75ffc93978fbb4ccaad86140051291a357458966016a1",
-                    "nonce" : "0xf6a8e1c6d87fc922",
+                    "hash" : "0xb849796b2d08dcbc7ceb4f7a58a3f75e36d8bb18fca5a28a7266a8f24241781d",
+                    "mixHash" : "0xa64e08f52e3da85057c14acc540fc223a5cfcea5768d54d75b43a45da40412c4",
+                    "nonce" : "0x528d6b3cd87aeebe",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09",
-                    "stateRoot" : "0x2dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7caf",
+                    "receiptTrie" : "0x1c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167",
+                    "stateRoot" : "0x6f85b659865397001231c1ec9db55a8e5f7644ca1c13ae8e0f430ce789e5e635",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a04b4009ddd11ba4ec54a75ffc93978fbb4ccaad86140051291a357458966016a188f6a8e1c6d87fc922f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06f85b659865397001231c1ec9db55a8e5f7644ca1c13ae8e0f430ce789e5e635a0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a01c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0a64e08f52e3da85057c14acc540fc223a5cfcea5768d54d75b43a45da40412c488528d6b3cd87aeebef90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ebbdb194e6c178687f50f26be3f26c5992436f499b8042abcd5fa04c385f35a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb849796b2d08dcbc7ceb4f7a58a3f75e36d8bb18fca5a28a7266a8f24241781d",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ab1a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_3_28948_11579_20500_d0g0v0_EIP158" : {
+    "modexp_3_28948_11579_20500_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/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa92c",
-                    "hash" : "0x5e1628001089cf11c23d806b71b24044833c80fb35564219b015d6a30d01dee1",
-                    "mixHash" : "0x9f1ab088cc24769e93fe09f9beb9e732c538f6d58892f5b09ee4403eac9676e0",
-                    "nonce" : "0xd3a54ae394e36cc5",
+                    "hash" : "0xea7cd2340a7a4efb671d16b73577174638e579bf94d16e4028a66b79d4da2a84",
+                    "mixHash" : "0xeb839fcd3c64ea4a0b6c330767cff762f83fd3bc2891ad82467f843c8a83107b",
+                    "nonce" : "0x0e14b734c0703174",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09",
-                    "stateRoot" : "0x2dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7caf",
+                    "receiptTrie" : "0x1c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167",
+                    "stateRoot" : "0x6f85b659865397001231c1ec9db55a8e5f7644ca1c13ae8e0f430ce789e5e635",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a09f1ab088cc24769e93fe09f9beb9e732c538f6d58892f5b09ee4403eac9676e088d3a54ae394e36cc5f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06f85b659865397001231c1ec9db55a8e5f7644ca1c13ae8e0f430ce789e5e635a0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a01c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0eb839fcd3c64ea4a0b6c330767cff762f83fd3bc2891ad82467f843c8a83107b880e14b734c0703174f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e1628001089cf11c23d806b71b24044833c80fb35564219b015d6a30d01dee1",
-        "network" : "EIP158",
+        "lastblockhash" : "0xea7cd2340a7a4efb671d16b73577174638e579bf94d16e4028a66b79d4da2a84",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6ab1a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_3_28948_11579_20500_d0g0v0_Frontier" : {
+    "modexp_3_28948_11579_20500_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/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa92c",
-                    "hash" : "0x9f1c00e47c18a9a3a26ca65d2308ec24c8de3d3987df670c44a7986cb54d5036",
-                    "mixHash" : "0x17b4d49a1063a8de2f95668e42637f5828ab1c01250fd0332f6327474b4edbcd",
-                    "nonce" : "0x68c4d64619919210",
+                    "hash" : "0x037edb9be8b0c78771837d1ae0a07ba84eb966326aba4e1e2587a522a5753f61",
+                    "mixHash" : "0x227c1bf6c60cdeb9df75f49891b50cde89c4f67ce0d2bbbc5461923077d4c026",
+                    "nonce" : "0x104fcab9076340c6",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a017b4d49a1063a8de2f95668e42637f5828ab1c01250fd0332f6327474b4edbcd8868c4d64619919210f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0227c1bf6c60cdeb9df75f49891b50cde89c4f67ce0d2bbbc5461923077d4c02688104fcab9076340c6f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f1c00e47c18a9a3a26ca65d2308ec24c8de3d3987df670c44a7986cb54d5036",
-        "network" : "Frontier",
+        "lastblockhash" : "0x037edb9be8b0c78771837d1ae0a07ba84eb966326aba4e1e2587a522a5753f61",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_3_28948_11579_20500_d0g0v0_Homestead" : {
+    "modexp_3_28948_11579_20500_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/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa92c",
-                    "hash" : "0x83290ddee3f00d388cbf4a48a73146d39da5ce4c94cefb24c4c2513131af6faa",
-                    "mixHash" : "0x762ab6cb9ec08ad7acabc1089f444985a28547171c1edd4896208314db31ac36",
-                    "nonce" : "0xee23fb05731a71a7",
+                    "hash" : "0xae134c8c6d27b1529789cc785a6aab6bcaa7c3c463febd19ad308a828fa49181",
+                    "mixHash" : "0x600fc51363f58511456d746b28118af32340d5e40f63e04448cf0aa2bdd7d576",
+                    "nonce" : "0x1c9ed92aa457bdfd",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
                     "receiptTrie" : "0x448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0762ab6cb9ec08ad7acabc1089f444985a28547171c1edd4896208314db31ac3688ee23fb05731a71a7f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0600fc51363f58511456d746b28118af32340d5e40f63e04448cf0aa2bdd7d576881c9ed92aa457bdfdf90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83290ddee3f00d388cbf4a48a73146d39da5ce4c94cefb24c4c2513131af6faa",
-        "network" : "Homestead",
+        "lastblockhash" : "0xae134c8c6d27b1529789cc785a6aab6bcaa7c3c463febd19ad308a828fa49181",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_3_28948_11579_20500_d0g0v0_Metropolis" : {
+    "modexp_3_28948_11579_20500_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/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa92c",
-                    "hash" : "0x0fe3e1b80f989c745e19114055d9fa338be1256b289e11cd5f33b3918f6abea5",
-                    "mixHash" : "0x4e276aa0aeb280388a8cb421dcfff5503e72dafa9aa7987b49ed2c1379d2a796",
-                    "nonce" : "0xb925a75fd00c9464",
+                    "hash" : "0x48467f1b7df1fd648b141e6f245918e7e60fbc6aedc9ce48a09c58f389e26441",
+                    "mixHash" : "0xc3115f369bbfa6782908663442facc577f0b376bcd7276d5c8cab0722aabd683",
+                    "nonce" : "0x83b43289a15fa3a5",
                     "number" : "0x01",
                     "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
-                    "receiptTrie" : "0x1c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167",
-                    "stateRoot" : "0x6f85b659865397001231c1ec9db55a8e5f7644ca1c13ae8e0f430ce789e5e635",
+                    "receiptTrie" : "0x448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09",
+                    "stateRoot" : "0x2dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7caf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06f85b659865397001231c1ec9db55a8e5f7644ca1c13ae8e0f430ce789e5e635a0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a01c42eab3e247d43b949e5d1a82eafecf93190006f56007b8969bbf18413d3167b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a04e276aa0aeb280388a8cb421dcfff5503e72dafa9aa7987b49ed2c1379d2a79688b925a75fd00c9464f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0c3115f369bbfa6782908663442facc577f0b376bcd7276d5c8cab0722aabd6838883b43289a15fa3a5f90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fe3e1b80f989c745e19114055d9fa338be1256b289e11cd5f33b3918f6abea5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x48467f1b7df1fd648b141e6f245918e7e60fbc6aedc9ce48a09c58f389e26441",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ab1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76154e6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_28948_11579_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa92c",
+                    "hash" : "0xe6f720d66449d1ae63ece7f3efae61410b153876cdff8eb52f29c7a4a508c046",
+                    "mixHash" : "0x229abb7e1c5e2d75b6ce3a7b334bbe5005b023a9ebf3a2d26c0bdda8e29cb7cd",
+                    "nonce" : "0x949248ef1cd578de",
+                    "number" : "0x01",
+                    "parentHash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+                    "receiptTrie" : "0x448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09",
+                    "stateRoot" : "0x2dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7caf",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02dae967c610749c012a2e2281927b130eda2163247c4fe366a687018af1f7cafa0fdf6e65a991b9a004c4f5dd9a7c1f4dbff7a290186f19df9a03f6070cd5cccb4a0448eac1ccda6c13348803046257e0ab203ee73abb4f9ffa5cabee0e528ea4f09b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a92c8203e880a0229abb7e1c5e2d75b6ce3a7b334bbe5005b023a9ebf3a2d26c0bdda8e29cb7cd88949248ef1cd578def90168f90165010182a92c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210340000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ba0d7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003a02ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa92c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xd7d925afa8a940b00be51a9c6b0ddc262a225998045969aeff895849f77d6003",
+                        "s" : "0x2ebf61180bc88fd2eb5d6733342f76a15a3b28aeb3e5083193b0a62f436b23f5",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x684a0a9a7fcd9bcd0668d483b720c4fd0eed49848f22bfe7b9fedd53c2d003b3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x56013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a056013ebedf2452830463eb382154547b8ca80c5eb61f1fde70b4cfe4c8679a8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe6f720d66449d1ae63ece7f3efae61410b153876cdff8eb52f29c7a4a508c046",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json
index 5f5a5ee78..3908b1f1f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_5_100_1000000_d0g0v0_EIP150" : {
+    "modexp_3_5_100_1000000_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/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x01e25c2835c84f4d06c0973e1f4da4de6d0259e93bfe110accdde220b7448a44",
-                    "mixHash" : "0x2c0215d22c789040c196db64bfc4d4b6f3bc321932727cd278b5ffbe91a3ac45",
-                    "nonce" : "0x64fde2b5c8883d57",
+                    "hash" : "0x011945e27eee878749a62298f40d8e9a360d31c99bc161d8c0c70ce8023dc918",
+                    "mixHash" : "0x13f1deada0c62f38f13eb4962b7c0497f23bf4fd8b3a07a831298a982e4a9dc8",
+                    "nonce" : "0x3f90d990ba2f0f56",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a02c0215d22c789040c196db64bfc4d4b6f3bc321932727cd278b5ffbe91a3ac458864fde2b5c8883d57f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a013f1deada0c62f38f13eb4962b7c0497f23bf4fd8b3a07a831298a982e4a9dc8883f90d990ba2f0f56f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01e25c2835c84f4d06c0973e1f4da4de6d0259e93bfe110accdde220b7448a44",
-        "network" : "EIP150",
+        "lastblockhash" : "0x011945e27eee878749a62298f40d8e9a360d31c99bc161d8c0c70ce8023dc918",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_5_100_1000000_d0g0v0_EIP158" : {
+    "modexp_3_5_100_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xbcbde4bf733175b6507deecb3d1d4213d296e614dc714e6001b578b31d04b6ed",
+                    "mixHash" : "0x01fb062e2e5e63d9de5582ee6f7b256851bbef6be71943e8b15ae349e263d83a",
+                    "nonce" : "0x6bbde258047d87bf",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a001fb062e2e5e63d9de5582ee6f7b256851bbef6be71943e8b15ae349e263d83a886bbde258047d87bff90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9a58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x44f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593",
+                        "s" : "0x40d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbcbde4bf733175b6507deecb3d1d4213d296e614dc714e6001b578b31d04b6ed",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_5_100_1000000_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/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x8595ee6e3b60e3d8873b8263b1bf36ccc893ff9a3ab4b0c15fc634158460cdda",
-                    "mixHash" : "0x52db0480929a80bb1f69223bd9ee00f471d2c74457882575c785ee756f0705c5",
-                    "nonce" : "0xb8bbf7e9b0025b72",
+                    "hash" : "0x3e94a7cd9bff8e28eb289340e99e62997dc764a8f50ff534516086b021be6a25",
+                    "mixHash" : "0x8fa33289674c1fb5f407510e53c01fbb50536cbc7ce973b32c7000003a80ade6",
+                    "nonce" : "0x9b5bbfb80d4606db",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a052db0480929a80bb1f69223bd9ee00f471d2c74457882575c785ee756f0705c588b8bbf7e9b0025b72f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a08fa33289674c1fb5f407510e53c01fbb50536cbc7ce973b32c7000003a80ade6889b5bbfb80d4606dbf90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8595ee6e3b60e3d8873b8263b1bf36ccc893ff9a3ab4b0c15fc634158460cdda",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3e94a7cd9bff8e28eb289340e99e62997dc764a8f50ff534516086b021be6a25",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_5_100_1000000_d0g0v0_Frontier" : {
+    "modexp_3_5_100_1000000_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/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9a58",
-                    "hash" : "0xc3e4517bad8e86c496c2551c3e4e34f61034fa50b0a08a910fd89e5a32caa77f",
-                    "mixHash" : "0x37c05b0352394ac849ef808f54ed6d7a06166fb69c721a8268015419b515fb41",
-                    "nonce" : "0x4670a5f9681bee1f",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xf1cd7dcf09681d2f8f0a7573be3eca689d5917f307466288de60482113f7861d",
+                    "mixHash" : "0xa11d75d1f1f0af95301eec6bb975ff53c1544017555a61190e0b95460cd87d26",
+                    "nonce" : "0x658001023a972c81",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x77eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603",
-                    "stateRoot" : "0x076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617a",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a037c05b0352394ac849ef808f54ed6d7a06166fb69c721a8268015419b515fb41884670a5f9681bee1ff90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0a11d75d1f1f0af95301eec6bb975ff53c1544017555a61190e0b95460cd87d2688658001023a972c81f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc3e4517bad8e86c496c2551c3e4e34f61034fa50b0a08a910fd89e5a32caa77f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf1cd7dcf09681d2f8f0a7573be3eca689d5917f307466288de60482113f7861d",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059c46",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75263ba",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_5_100_1000000_d0g0v0_Homestead" : {
+    "modexp_3_5_100_1000000_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/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9a58",
-                    "hash" : "0x025fdfcd0a1c14d185430346dfa7a7bb2614a62b67c7fdaafccfa9f70424e600",
-                    "mixHash" : "0x9084d2bb4cc649239064ddd087d25c69effb6b2d67573fab05f1286a5b552886",
-                    "nonce" : "0xee6841cfcbc339c5",
+                    "hash" : "0xd4195edb0c7c09dd1e12b632e35e2f31adb508e7305a7a20af8adfd41ac41fc2",
+                    "mixHash" : "0xba9677b223b2b4ac9b03d0516f5049084a133f57bab7dcd3582e4c8945f26525",
+                    "nonce" : "0x16b09191486a32ef",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x77eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a09084d2bb4cc649239064ddd087d25c69effb6b2d67573fab05f1286a5b55288688ee6841cfcbc339c5f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a0ba9677b223b2b4ac9b03d0516f5049084a133f57bab7dcd3582e4c8945f265258816b09191486a32eff90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x025fdfcd0a1c14d185430346dfa7a7bb2614a62b67c7fdaafccfa9f70424e600",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd4195edb0c7c09dd1e12b632e35e2f31adb508e7305a7a20af8adfd41ac41fc2",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_5_100_1000000_d0g0v0_Metropolis" : {
+    "modexp_3_5_100_1000000_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/stPreCompiledContracts/modexp_3_5_100_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x51d90bc45bb3604c2f3480800b7921080fa3b50aa686132c3f7ca2150e8e214d",
-                    "mixHash" : "0x2bfcdc1bf7b9c43801cdee335cb24ea4510160c0e10dbae64eeb80c13325e2d8",
-                    "nonce" : "0x3b0fe4c071af6100",
+                    "gasUsed" : "0x0f9a58",
+                    "hash" : "0x291774624b2488c65ca3dfcd35d5c7a92b9bac853bcb0c426b1dcff62b766bb1",
+                    "mixHash" : "0x088842c17717ac2f23f2ec5110d09e48eb0d560cac4c29022bb1726585eea3ec",
+                    "nonce" : "0x7cef3d0a631f271d",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "receiptTrie" : "0x77eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603",
+                    "stateRoot" : "0x076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a02bfcdc1bf7b9c43801cdee335cb24ea4510160c0e10dbae64eeb80c13325e2d8883b0fe4c071af6100f90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0076ffeb99c2b914ac83fed236746fa2a17660316a80f23df0ecc04670ab3617aa0f64dbeeae3e59955fa72f74f13fc07983db2ba442ae2a7a2dd0993aa425c3dc4a077eac30b35a4c93844c00a1ae87a779620028e730d9ee1680c3ae42c89788603b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9a588203e880a0088842c17717ac2f23f2ec5110d09e48eb0d560cac4c29022bb1726585eea3ec887cef3d0a631f271df90128f901250101830f9a5894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca044f408b9d1d8165f024a1a700f2dfb50d137288aae5bd0c34bba60de15067593a040d80a710421c2c6c0bc09faedfea7baf1c8ab6e9cb8e3e8d8ce3ec01d9e3742c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51d90bc45bb3604c2f3480800b7921080fa3b50aa686132c3f7ca2150e8e214d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x291774624b2488c65ca3dfcd35d5c7a92b9bac853bcb0c426b1dcff62b766bb1",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918245059c46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a75263ba",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json
index baba52896..1e38b158c 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_5_100_155000_d0g0v0_EIP150" : {
+    "modexp_3_5_100_155000_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/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x89b3bf8083fd91ad4d5bc321874b25a6628a0dba937409832d06c9b8bb767dd3",
-                    "mixHash" : "0x41625d75f48042ac1e1f20e86467b1b48f35c87215d8c69c0a8a9f935781397d",
-                    "nonce" : "0x16e6c6246ee9eae8",
+                    "hash" : "0xf6730a9fa8500f6a41d830606a28ac1135f1fee5f9134dfb4e3eabd8c3c0943d",
+                    "mixHash" : "0xb2cf8929242e2aecac4981d9a9e0f93182d510e621bbda5859c55aeefc2494fb",
+                    "nonce" : "0x4037b2b4eb802008",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a041625d75f48042ac1e1f20e86467b1b48f35c87215d8c69c0a8a9f935781397d8816e6c6246ee9eae8f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0b2cf8929242e2aecac4981d9a9e0f93182d510e621bbda5859c55aeefc2494fb884037b2b4eb802008f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89b3bf8083fd91ad4d5bc321874b25a6628a0dba937409832d06c9b8bb767dd3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf6730a9fa8500f6a41d830606a28ac1135f1fee5f9134dfb4e3eabd8c3c0943d",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_5_100_155000_d0g0v0_EIP158" : {
+    "modexp_3_5_100_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xf1a3be2bb5e8f80c2942ac22dd051d7de901c96d242672adf9687b456461e262",
+                    "mixHash" : "0xcc1887275bdadece01f9c2cf3de09046716fb4df7f3b09fdcfb8fd50c2706acf",
+                    "nonce" : "0x7eb697940e6814cc",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0cc1887275bdadece01f9c2cf3de09046716fb4df7f3b09fdcfb8fd50c2706acf887eb697940e6814ccf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b590",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xa97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddad",
+                        "s" : "0x755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf1a3be2bb5e8f80c2942ac22dd051d7de901c96d242672adf9687b456461e262",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_5_100_155000_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/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xc16c1d92a4ff3b161f8931f3b0a43be84b43c3ba05235f88cc37d22726db4240",
-                    "mixHash" : "0xd31a9d3f47e066c455c0befb661ed219388803e8f44969adc2793eff6ae1a9c6",
-                    "nonce" : "0xf6f3d4d683685db8",
+                    "hash" : "0x8dda90c213c36daa510e9b506cabaf36bc7219cc45fc8a8f016162032cf64c4b",
+                    "mixHash" : "0x051fee537fd128d357934a8d6a4406feb093797687d17ebd3f66464295332192",
+                    "nonce" : "0x354600dc37157aad",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0d31a9d3f47e066c455c0befb661ed219388803e8f44969adc2793eff6ae1a9c688f6f3d4d683685db8f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0051fee537fd128d357934a8d6a4406feb093797687d17ebd3f6646429533219288354600dc37157aadf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc16c1d92a4ff3b161f8931f3b0a43be84b43c3ba05235f88cc37d22726db4240",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8dda90c213c36daa510e9b506cabaf36bc7219cc45fc8a8f016162032cf64c4b",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_5_100_155000_d0g0v0_Frontier" : {
+    "modexp_3_5_100_155000_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/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b590",
-                    "hash" : "0x8d080ec55bcf2f3d89cf9d8294d88a6b7ee017a9b9c2cdf031528faec5b50311",
-                    "mixHash" : "0x08334e155d43d88d601cc7c210b3fbafbff903a875b5c39e5dd6dbaf5d8ded03",
-                    "nonce" : "0xf04ebcd6bf6cc7cd",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xbe9fa8733164393ccfbae116df0922fc3f4ea41f4cb3655e2ae0cd28fc38a5c7",
+                    "mixHash" : "0x7e0240bdb84f33123a2b6a432b8a59858227de8bdc604db29292dbc54331e72b",
+                    "nonce" : "0x2d898ed5c0d27f62",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5",
-                    "stateRoot" : "0xaeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a008334e155d43d88d601cc7c210b3fbafbff903a875b5c39e5dd6dbaf5d8ded0388f04ebcd6bf6cc7cdf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a07e0240bdb84f33123a2b6a432b8a59858227de8bdc604db29292dbc54331e72b882d898ed5c0d27f62f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d080ec55bcf2f3d89cf9d8294d88a6b7ee017a9b9c2cdf031528faec5b50311",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbe9fa8733164393ccfbae116df0922fc3f4ea41f4cb3655e2ae0cd28fc38a5c7",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b77e",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4882",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_5_100_155000_d0g0v0_Homestead" : {
+    "modexp_3_5_100_155000_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/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b590",
-                    "hash" : "0xc77b2d09d294a77ab9cad34b5fb3d364877f29185a739ba3ec2b58217bedd55a",
-                    "mixHash" : "0x2c81071c66deb202e102cc869b0f0f55d7ffe00be4279d0d5f336f5ebd8fef2a",
-                    "nonce" : "0xc6e8435c38983cad",
+                    "hash" : "0x41d1895009f0a7d2445a132d21fa1f0462941a6edccab41d45bdb03d511e6a61",
+                    "mixHash" : "0x53a5f1139608e5fe5ffe24aadf0dea4f437a6cceb6ada90802fed3ecd7261a20",
+                    "nonce" : "0x7f03babc5ed83f57",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a02c81071c66deb202e102cc869b0f0f55d7ffe00be4279d0d5f336f5ebd8fef2a88c6e8435c38983cadf90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a053a5f1139608e5fe5ffe24aadf0dea4f437a6cceb6ada90802fed3ecd7261a20887f03babc5ed83f57f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc77b2d09d294a77ab9cad34b5fb3d364877f29185a739ba3ec2b58217bedd55a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x41d1895009f0a7d2445a132d21fa1f0462941a6edccab41d45bdb03d511e6a61",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_5_100_155000_d0g0v0_Metropolis" : {
+    "modexp_3_5_100_155000_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/stPreCompiledContracts/modexp_3_5_100_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x67048d3dfafb40879ff892d476efd576ef77dfbdb78cc76eaa0df852e953f4a5",
-                    "mixHash" : "0xa711415fbf108068042697bbb47b34a657e4531f359a15f5124fcbca3d98d27e",
-                    "nonce" : "0xd468b9daa3e2f4a3",
+                    "gasUsed" : "0x02b590",
+                    "hash" : "0x8a771fee44b603692c91401dd209998e4273950a00434ff24171f310a14fe9c3",
+                    "mixHash" : "0xab55753c7601d8400f4ce8de95bd581db3ff10cd8a8339cc87183c0afa674e39",
+                    "nonce" : "0xf6b57dc1fd63a424",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "receiptTrie" : "0x820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5",
+                    "stateRoot" : "0xaeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0a711415fbf108068042697bbb47b34a657e4531f359a15f5124fcbca3d98d27e88d468b9daa3e2f4a3f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
+                "rlp" : "0xf90328f901f9a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0aeed5c3638227056eab7f4769546093a478de211275b1686971ce3f36516ed81a04b5b5a5d2757d8a1393b5762c195891a547e12f36211e26f3d0a58738916dfcda0820c39ecadd861ffe73a53a114cb6a19b6a8498e09386e4b45b1cde0f9f914b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b5908203e880a0ab55753c7601d8400f4ce8de95bd581db3ff10cd8a8339cc87183c0afa674e3988f6b57dc1fd63a424f90128f9012501018302b59094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0a97f0bb057ddc4850c099ba7a14dca574e896860c0ddcfd475d9fa79268eddada0755b73ea4c10d6d59043aecaf02814f2c856ab8cb08681e8d7a93e5aa06e56b4c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67048d3dfafb40879ff892d476efd576ef77dfbdb78cc76eaa0df852e953f4a5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8a771fee44b603692c91401dd209998e4273950a00434ff24171f310a14fe9c3",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f8b77e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a75f4882",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json
index cd15e543a..fcd25c07e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_5_100_20500_d0g0v0_EIP150" : {
+    "modexp_3_5_100_20500_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/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0xef1cbbd4ebdad16993a650d97b1945433944896ec62e71e9f2804480ef3e6926",
-                    "mixHash" : "0x9040ed9eff69d06261075a004aaf7f9378398b637bdceff34ff487bf550c486e",
-                    "nonce" : "0xb8be259e7015f390",
+                    "hash" : "0x009b248c7813aae6350bb9506c59c0c0520b5205d0c40eab1a17dce8bc4949ff",
+                    "mixHash" : "0x951f598da723ee759435398ee4e88e31e764723d0b90b3c923d524702f0d1191",
+                    "nonce" : "0xf8b0ca68065f51bf",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
-                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
+                    "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
+                    "stateRoot" : "0xb2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a09040ed9eff69d06261075a004aaf7f9378398b637bdceff34ff487bf550c486e88b8be259e7015f390f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29ca0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0951f598da723ee759435398ee4e88e31e764723d0b90b3c923d524702f0d119188f8b0ca68065f51bff90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef1cbbd4ebdad16993a650d97b1945433944896ec62e71e9f2804480ef3e6926",
-        "network" : "EIP150",
+        "lastblockhash" : "0x009b248c7813aae6350bb9506c59c0c0520b5205d0c40eab1a17dce8bc4949ff",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aa1a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_3_5_100_20500_d0g0v0_EIP158" : {
+    "modexp_3_5_100_20500_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/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0xea0a83956574df52369d06592424e20025e2d8d6309e97fd84758ea355b79443",
-                    "mixHash" : "0xca5941d18636559fcabcab4837273ad62f233ca79639bec462d4b91ead17652d",
-                    "nonce" : "0x3849976dfded2f8c",
+                    "hash" : "0xfe1bced723f9e8f8485b4cd0a47b554b6a5ee61ead8afaf532716c2a07ff2237",
+                    "mixHash" : "0x8d136c84979f7ad1fe638635327e1286b82698e7e99f70a2cea76e304b97ca6c",
+                    "nonce" : "0xb353abb809c96e63",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
-                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
+                    "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
+                    "stateRoot" : "0xb2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0ca5941d18636559fcabcab4837273ad62f233ca79639bec462d4b91ead17652d883849976dfded2f8cf90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29ca0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a08d136c84979f7ad1fe638635327e1286b82698e7e99f70a2cea76e304b97ca6c88b353abb809c96e63f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea0a83956574df52369d06592424e20025e2d8d6309e97fd84758ea355b79443",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfe1bced723f9e8f8485b4cd0a47b554b6a5ee61ead8afaf532716c2a07ff2237",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aa1a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_3_5_100_20500_d0g0v0_Frontier" : {
+    "modexp_3_5_100_20500_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/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0x8df08a8a402d16f0851943b430e141cec6743a87c6af67564da87cd981b7acaf",
-                    "mixHash" : "0xebbdd3f74ce6e66acffdcbbb81f137f2fba9d7e990de9a42c75af19d816addb7",
-                    "nonce" : "0xf45a1f30a10460f4",
+                    "hash" : "0x566fc35911aa86cd6e669b02130d9b8f786c3c0fc37e4fd420c29e5bd3a872ac",
+                    "mixHash" : "0x4c5298621ea49cf267f5f3053d4fd187232c5a1f9a806ac3074d89157c3b7125",
+                    "nonce" : "0x026822b08d0075fb",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0ebbdd3f74ce6e66acffdcbbb81f137f2fba9d7e990de9a42c75af19d816addb788f45a1f30a10460f4f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a04c5298621ea49cf267f5f3053d4fd187232c5a1f9a806ac3074d89157c3b712588026822b08d0075fbf90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8df08a8a402d16f0851943b430e141cec6743a87c6af67564da87cd981b7acaf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x566fc35911aa86cd6e669b02130d9b8f786c3c0fc37e4fd420c29e5bd3a872ac",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_3_5_100_20500_d0g0v0_Homestead" : {
+    "modexp_3_5_100_20500_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/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0xd079ed2bcecb4b4aa368b0d30654750392265691f575714af8019c421f008ffd",
-                    "mixHash" : "0x81799b88a8cf974e7db7e432d5bafdaeae2a5d5a287eb6067e4c8a7a91cd4570",
-                    "nonce" : "0xec582c1f55011784",
+                    "hash" : "0x23fa32ed36432a67e828af062a2804a1ddbbb42e931ab904a68adde239accdc2",
+                    "mixHash" : "0x5caaa31eb0e0236f0bc1d945ccd1912391c481b3c0bb940dc43712cbe3a6e9e8",
+                    "nonce" : "0xfd3d52534e3d5140",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a081799b88a8cf974e7db7e432d5bafdaeae2a5d5a287eb6067e4c8a7a91cd457088ec582c1f55011784f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a05caaa31eb0e0236f0bc1d945ccd1912391c481b3c0bb940dc43712cbe3a6e9e888fd3d52534e3d5140f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd079ed2bcecb4b4aa368b0d30654750392265691f575714af8019c421f008ffd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x23fa32ed36432a67e828af062a2804a1ddbbb42e931ab904a68adde239accdc2",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_3_5_100_20500_d0g0v0_Metropolis" : {
+    "modexp_3_5_100_20500_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/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa82c",
-                    "hash" : "0x3c51b298c14066075454f5d76e07c5012a06b2ea1850ec931b74f024d3d294db",
-                    "mixHash" : "0x13267d861abf9e33db0d4823edb6aaa259944d2f8617f9ac0cedd3ba1e8b27b7",
-                    "nonce" : "0x89027dd2408f2a79",
+                    "hash" : "0x82741dff7a82c1ce4221c5ee39dd24682520be92e478b6ce7388a30781496172",
+                    "mixHash" : "0x41e1b61e5fdd9095a71536cf233ebd89b50f13d28e19406791e5f5486046d992",
+                    "nonce" : "0xf62622dbc4cbdf60",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x7917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097b",
-                    "stateRoot" : "0xb2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29c",
+                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
+                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b2a002d66e620ded82eb42c0f44fca65f8e897093d8a36a2006390fcbbedf29ca0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea07917d558998776091d17c1b01e1ad00e9bb51ad9e0da96ce5c0a13328253097bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a013267d861abf9e33db0d4823edb6aaa259944d2f8617f9ac0cedd3ba1e8b27b78889027dd2408f2a79f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a041e1b61e5fdd9095a71536cf233ebd89b50f13d28e19406791e5f5486046d99288f62622dbc4cbdf60f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c51b298c14066075454f5d76e07c5012a06b2ea1850ec931b74f024d3d294db",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x82741dff7a82c1ce4221c5ee39dd24682520be92e478b6ce7388a30781496172",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aa1a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76155e6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_5_100_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_5_100_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa82c",
+                    "hash" : "0x3766960bcd3e321a0b59825cba6e0cd1d462749e555db260812b5ae7dbe1ccf1",
+                    "mixHash" : "0xa3085ad97889756d9b482a9d188195359ad0b0ac3ab0040131186783a4c516cd",
+                    "nonce" : "0x1dfcf6121ee3f184",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0x2e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975",
+                    "stateRoot" : "0x20eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90325f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a020eeea31e3989527a2521d9307fca39a877cca23aa9640d2c69c177c2a98be09a0cdab6a76468d10e78cc4326adbf64787064660062abfbfde438dc8f125ce2e0ea02e8f69967fdf536b74f01588505ca8564c12789da42d3dbae179a00f954b7975b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a82c8203e880a0a3085ad97889756d9b482a9d188195359ad0b0ac3ab0040131186783a4c516cd881dfcf6121ee3f184f90126f90123010182a82c94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca02bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c7009fc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa82c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2bb95d9b82328849ca2842774c988419b3a340682f7806e6601bf7f5f800c700",
+                        "s" : "0xc5e935dd0616d1bbb41793bd39ed7bc4bd5f11f5918f3eb48f7703df7f6d76",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3766960bcd3e321a0b59825cba6e0cd1d462749e555db260812b5ae7dbe1ccf1",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json
index 48e1f2b28..4aed5fce6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_5_100_22000_d0g0v0_EIP150" : {
+    "modexp_3_5_100_22000_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/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x89be68c76fabf0398ceec8bcefe5360e9c2ba173f2f47c67acddb3c3923857ce",
-                    "mixHash" : "0xea6286eee7e1ea0d6feff2fcf08371436e02979f34e3480d844fe7e0dd4f7ad9",
-                    "nonce" : "0xc98d64583ebf68a7",
+                    "hash" : "0xef359621faf9fdb7b5af33d70778a0b3c362e4b37f4de4d6f9c3f934178a3d74",
+                    "mixHash" : "0xcbe11d5e8281781dd7e1207692bf200914acc5c3e57cf2d8c103e0b4fbc0ef09",
+                    "nonce" : "0x73593ec7cc007113",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0ea6286eee7e1ea0d6feff2fcf08371436e02979f34e3480d844fe7e0dd4f7ad988c98d64583ebf68a7f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0cbe11d5e8281781dd7e1207692bf200914acc5c3e57cf2d8c103e0b4fbc0ef098873593ec7cc007113f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89be68c76fabf0398ceec8bcefe5360e9c2ba173f2f47c67acddb3c3923857ce",
-        "network" : "EIP150",
+        "lastblockhash" : "0xef359621faf9fdb7b5af33d70778a0b3c362e4b37f4de4d6f9c3f934178a3d74",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_5_100_22000_d0g0v0_EIP158" : {
+    "modexp_3_5_100_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x3a794459ae27504433a2f056b41c199513c317e60ea168071eb8e92c2f14d886",
+                    "mixHash" : "0xf7b052b7dafbec8418503af2eca32f72907a566c956652d3496931b432ec9639",
+                    "nonce" : "0x8b7e88edd44abf45",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0f7b052b7dafbec8418503af2eca32f72907a566c956652d3496931b432ec9639888b7e88edd44abf45f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xae08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x3ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76b",
+                        "s" : "0x5f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a794459ae27504433a2f056b41c199513c317e60ea168071eb8e92c2f14d886",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_5_100_22000_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/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x36c39405f60bfc4a2336f7bf8fc45335d596251b094b68fcd783678f76d936ce",
-                    "mixHash" : "0x98d53c1bfc8838ca589ca52e637d9127c6ba0d23ddaf628ae63d56cc80b210ef",
-                    "nonce" : "0x204f04580c737796",
+                    "hash" : "0xc8d4bc073d35601d0ecd2d33fb91589664f496060db9d8744b6a7b46706c1c73",
+                    "mixHash" : "0x29ee566b3104ae22735d43c70907188c203a76a79691162e97930298d6a4fb41",
+                    "nonce" : "0xfe57b9260add919d",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a098d53c1bfc8838ca589ca52e637d9127c6ba0d23ddaf628ae63d56cc80b210ef88204f04580c737796f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a029ee566b3104ae22735d43c70907188c203a76a79691162e97930298d6a4fb4188fe57b9260add919df90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36c39405f60bfc4a2336f7bf8fc45335d596251b094b68fcd783678f76d936ce",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc8d4bc073d35601d0ecd2d33fb91589664f496060db9d8744b6a7b46706c1c73",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_5_100_22000_d0g0v0_Frontier" : {
+    "modexp_3_5_100_22000_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/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae08",
-                    "hash" : "0xe1dd2990708c0356887b6f8d823e35933f95afcaff4b0cd9381678dfb5c24906",
-                    "mixHash" : "0xdf77546f4be46578f27166775bec2bff3b010d65b83e3e3c822927b805247afe",
-                    "nonce" : "0x47c47dbdf525ce37",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xdb9edc873c84fd69e478a46e16c87c379ade524b9cbf8aac9adba6f654f37b9a",
+                    "mixHash" : "0x629419b3523e8c3aa151898cc0d53107db9aaaae2e8a07d36f43fb58807fb603",
+                    "nonce" : "0x75a115e0499b8446",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8",
-                    "stateRoot" : "0x0b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2e",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a0df77546f4be46578f27166775bec2bff3b010d65b83e3e3c822927b805247afe8847c47dbdf525ce37f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0629419b3523e8c3aa151898cc0d53107db9aaaae2e8a07d36f43fb58807fb6038875a115e0499b8446f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1dd2990708c0356887b6f8d823e35933f95afcaff4b0cd9381678dfb5c24906",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdb9edc873c84fd69e478a46e16c87c379ade524b9cbf8aac9adba6f654f37b9a",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6aff6",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a761500a",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_5_100_22000_d0g0v0_Homestead" : {
+    "modexp_3_5_100_22000_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/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae08",
-                    "hash" : "0x38941438edf0540ce66196170705c346ee19f1efb36d8a379af2b3539babccc5",
-                    "mixHash" : "0x11fc6fb48b61eb6d267982c2fecbc2540d66638f883eb81fad9193b942440336",
-                    "nonce" : "0xe9139009c3462e84",
+                    "hash" : "0x865cca4d74446b811d4293a8b642c58e9a5c69e8eb4f82b503bd6471763d23dd",
+                    "mixHash" : "0x0ce1bd08a6f182b6020272e3546723e8499925b1c7bbc5f0df3a55ba57bdb6e1",
+                    "nonce" : "0xb47033039e5a3670",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a011fc6fb48b61eb6d267982c2fecbc2540d66638f883eb81fad9193b94244033688e9139009c3462e84f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a00ce1bd08a6f182b6020272e3546723e8499925b1c7bbc5f0df3a55ba57bdb6e188b47033039e5a3670f90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38941438edf0540ce66196170705c346ee19f1efb36d8a379af2b3539babccc5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x865cca4d74446b811d4293a8b642c58e9a5c69e8eb4f82b503bd6471763d23dd",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_5_100_22000_d0g0v0_Metropolis" : {
+    "modexp_3_5_100_22000_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/stPreCompiledContracts/modexp_3_5_100_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0xaad44395797d995466497ff9fb7992b25858b39341c2491e7b962a1bca87f195",
-                    "mixHash" : "0xf786089e8f97cee1708cce9df20201817344f2d828ba2ce000da3aed90a87b98",
-                    "nonce" : "0x277228ce6ef1162d",
+                    "gasUsed" : "0xae08",
+                    "hash" : "0x32d79d00be903f4c16c078a2208f6d36789b290c93530bf32bb0722148c5cc6f",
+                    "mixHash" : "0xebcc56efc49bbcd002eb76cc0580ca45c2531491c04ca63a85a4bda63d44473e",
+                    "nonce" : "0x3bdf37f6268ebdfc",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "receiptTrie" : "0x023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8",
+                    "stateRoot" : "0x0b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0f786089e8f97cee1708cce9df20201817344f2d828ba2ce000da3aed90a87b9888277228ce6ef1162df90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a00b50d197807fb7e3516e1b1493201a40d8dab363f6d347508159438ecb0fce2ea09d7fed0a4a78cb5e729bb99181281315f0e2256ce9deeef2224d7042df7093c6a0023df145aab157d0586bc99da82f503584c541f858eff15b9bd6fe1daaf40cb8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae088203e880a0ebcc56efc49bbcd002eb76cc0580ca45c2531491c04ca63a85a4bda63d44473e883bdf37f6268ebdfcf90127f90124010182ae0894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca03ad114164cd279ebc4ca79e576013f9861cd973fb916ce96fe73b3af63edc76ba05f596d8ea7db295337b10a62b1792fa9d70fd6f9273768c5a8bdb5493f8b8e21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaad44395797d995466497ff9fb7992b25858b39341c2491e7b962a1bca87f195",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x32d79d00be903f4c16c078a2208f6d36789b290c93530bf32bb0722148c5cc6f",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f6aff6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a761500a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json
index e8ac208c1..09e7331fa 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_5_100_25000_d0g0v0_EIP150" : {
+    "modexp_3_5_100_25000_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/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x50ad6c7f19d689331345a87676beee55d556e4db40f11c71de713627ae8734cb",
-                    "mixHash" : "0x498898cc6a7a3c49d1dfa14729b6999a7a27752b9375f1232d10b3542f47f622",
-                    "nonce" : "0x1db0d9d9e5858eb1",
+                    "hash" : "0xcbffe99da982cbdf1885277922b42342884627d5f385194cd6a33d89f76e0e8b",
+                    "mixHash" : "0x5445381cfa1caaa58381fede4ce6a509503e998c7175bee17b35a5b56c9d788f",
+                    "nonce" : "0xc81f91015da361b1",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0498898cc6a7a3c49d1dfa14729b6999a7a27752b9375f1232d10b3542f47f622881db0d9d9e5858eb1f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a05445381cfa1caaa58381fede4ce6a509503e998c7175bee17b35a5b56c9d788f88c81f91015da361b1f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50ad6c7f19d689331345a87676beee55d556e4db40f11c71de713627ae8734cb",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcbffe99da982cbdf1885277922b42342884627d5f385194cd6a33d89f76e0e8b",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_5_100_25000_d0g0v0_EIP158" : {
+    "modexp_3_5_100_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0xa002384a296820c9d2430277c697cd8976256c192ffb60a0679121f3f22554ce",
+                    "mixHash" : "0xc88849a3d0eaa0d810d53489a75b42b8d15282fe67a1b1c9099d0ebd69fb412c",
+                    "nonce" : "0xc103122a071b14a1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0c88849a3d0eaa0d810d53489a75b42b8d15282fe67a1b1c9099d0ebd69fb412c88c103122a071b14a1f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xb9c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xfd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5a",
+                        "s" : "0x7d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa002384a296820c9d2430277c697cd8976256c192ffb60a0679121f3f22554ce",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_5_100_25000_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/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0x105ff9d77c23d5dc62553cec2c5ece1f451a01afb460205af6aa3cd3a54c18b9",
-                    "mixHash" : "0xe9c70df6d37f052a041db387906f23e58e5ca21ff2b4668646dfc738975d2bfb",
-                    "nonce" : "0xad3da1f7da8ca526",
+                    "hash" : "0x1e88e43ab36ee80fd55a010305e9d94b8438d9c8e91964b825e7f66ac0a6835b",
+                    "mixHash" : "0x01d7062cb8ce56ea9046877ff24c501b6987e2100cf790d84f54c618cb8a7a58",
+                    "nonce" : "0xe9630278be78f3a3",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0e9c70df6d37f052a041db387906f23e58e5ca21ff2b4668646dfc738975d2bfb88ad3da1f7da8ca526f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a001d7062cb8ce56ea9046877ff24c501b6987e2100cf790d84f54c618cb8a7a5888e9630278be78f3a3f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x105ff9d77c23d5dc62553cec2c5ece1f451a01afb460205af6aa3cd3a54c18b9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1e88e43ab36ee80fd55a010305e9d94b8438d9c8e91964b825e7f66ac0a6835b",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_5_100_25000_d0g0v0_Frontier" : {
+    "modexp_3_5_100_25000_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/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xb9c0",
-                    "hash" : "0x26747a8461f954a8646cb4d5ef562fd593b6603b70219180e63c65835459d2ab",
-                    "mixHash" : "0x967c81ed0632d3496193236355884cd3b9409d44825a2360ac34e5f15735b331",
-                    "nonce" : "0x1993f732c339ec13",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x5e3ae128fe386a5398d3d9676ec22d4929163cd188d58b615d98f09ea581a79c",
+                    "mixHash" : "0x1531f5d3102f3734b24adc12737465a888d14d3aee0242b6bb282164cfe9690f",
+                    "nonce" : "0x3bf2f43aa478cc8d",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0x6a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1a",
-                    "stateRoot" : "0x81eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a0967c81ed0632d3496193236355884cd3b9409d44825a2360ac34e5f15735b331881993f732c339ec13f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a01531f5d3102f3734b24adc12737465a888d14d3aee0242b6bb282164cfe9690f883bf2f43aa478cc8df90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26747a8461f954a8646cb4d5ef562fd593b6603b70219180e63c65835459d2ab",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5e3ae128fe386a5398d3d9676ec22d4929163cd188d58b615d98f09ea581a79c",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bbae",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614452",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_5_100_25000_d0g0v0_Homestead" : {
+    "modexp_3_5_100_25000_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/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xb9c0",
-                    "hash" : "0x1828eedf93e8ed38e3fc8c88b06d60652586ccae1b693fd817bd2d101badfaa9",
-                    "mixHash" : "0xfc931a138a46544f5002d0da0b7285046dd5194b196b7998e76800f13a0c1a3a",
-                    "nonce" : "0x079aa384fc321ad4",
+                    "hash" : "0x66e00ba0d79341ae91ad1c8baf4fad349862680c42564a7133925335413bd2d8",
+                    "mixHash" : "0x56a3fa5124792f31e6c8f34c6eecfcf0ea76cad7f053e605c25d0379622f2d7e",
+                    "nonce" : "0x77e780828246459f",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0x6a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1a",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a0fc931a138a46544f5002d0da0b7285046dd5194b196b7998e76800f13a0c1a3a88079aa384fc321ad4f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a056a3fa5124792f31e6c8f34c6eecfcf0ea76cad7f053e605c25d0379622f2d7e8877e780828246459ff90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1828eedf93e8ed38e3fc8c88b06d60652586ccae1b693fd817bd2d101badfaa9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x66e00ba0d79341ae91ad1c8baf4fad349862680c42564a7133925335413bd2d8",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_5_100_25000_d0g0v0_Metropolis" : {
+    "modexp_3_5_100_25000_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/stPreCompiledContracts/modexp_3_5_100_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x72cd053cb62387c2c9735374a27cf272d4183ea57bb6f2fa63825ea331ab8df0",
-                    "mixHash" : "0x28b6761a2115299ea5f070930188f08e78e1ca0f2f6b5103ad58ac6c2f99a59c",
-                    "nonce" : "0x2dc41f3650dce135",
+                    "gasUsed" : "0xb9c0",
+                    "hash" : "0x7f34542b3cac045dbf6d3e337770ad7ca42b31cc398f65c8c037c295deec8332",
+                    "mixHash" : "0xf3c7dc814f0517d3415153d5beec80122613f0aa79c68e8073840082337e2b3a",
+                    "nonce" : "0xfef1290531b8374b",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "receiptTrie" : "0x6a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1a",
+                    "stateRoot" : "0x81eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a028b6761a2115299ea5f070930188f08e78e1ca0f2f6b5103ad58ac6c2f99a59c882dc41f3650dce135f90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a081eb908db4ebe06783566d12788b00e88b58a20fedae3a83068c5e18155cdf29a02906c7ee6426a4c3545aeb4e9cd1a595d35b36b97aa4eaa9fbc9867094043cc4a06a237b695958f18b20f5592a0801556f371eaf3d7a1602a8ddb5a34fe127dc1ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082b9c08203e880a0f3c7dc814f0517d3415153d5beec80122613f0aa79c68e8073840082337e2b3a88fef1290531b8374bf90127f90124010182b9c094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ca0fd5a8c3b0bbbd3faed47a2af3ba536e36a2d4a4ede8efc7910ab7cede5ec7f5aa07d88b9dcfe878db1d88c9735ae6c7cecc273b064424fa109c963638d0c3016b0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72cd053cb62387c2c9735374a27cf272d4183ea57bb6f2fa63825ea331ab8df0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7f34542b3cac045dbf6d3e337770ad7ca42b31cc398f65c8c037c295deec8332",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f6bbae",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a7614452",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json
index 4a4feb42e..a0c6dc30b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_3_5_100_35000_d0g0v0_EIP150" : {
+    "modexp_3_5_100_35000_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/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xd990aa51b5643e160f0a98523e681368375034974c3fde64521e7a87531afa3c",
-                    "mixHash" : "0x146d8cf59ca3852dd2d6eacf01e4327e9caaff2acbd72be394110cf9ec11d227",
-                    "nonce" : "0xc1c4153fe33788fa",
+                    "hash" : "0x7e3f6ab7dd39b1fc7757b40f8d2b2595845a01ed8c2e35541efb8bfc184edacf",
+                    "mixHash" : "0x5354190e04460df4d7718a50c631379892e9912d045598eec488cd659c4c3076",
+                    "nonce" : "0xb8f214711988290a",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
-                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0146d8cf59ca3852dd2d6eacf01e4327e9caaff2acbd72be394110cf9ec11d22788c1c4153fe33788faf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a05354190e04460df4d7718a50c631379892e9912d045598eec488cd659c4c307688b8f214711988290af90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd990aa51b5643e160f0a98523e681368375034974c3fde64521e7a87531afa3c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7e3f6ab7dd39b1fc7757b40f8d2b2595845a01ed8c2e35541efb8bfc184edacf",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6af7f",
                 "code" : "",
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_3_5_100_35000_d0g0v0_EIP158" : {
+    "modexp_3_5_100_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x571b78ecd6268ff7a16d799962fd12e09315c2d52556dec246cc46eceecb5424",
+                    "mixHash" : "0x779c924b03e774f36ce1d097242fc15149e8158a43bfcb59a732fdcd4812000c",
+                    "nonce" : "0x50cd2facce4d1022",
+                    "number" : "0x01",
+                    "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
+                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0779c924b03e774f36ce1d097242fc15149e8158a43bfcb59a732fdcd4812000c8850cd2facce4d1022f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe0d0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xdba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0d",
+                        "s" : "0x3ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61fa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x571b78ecd6268ff7a16d799962fd12e09315c2d52556dec246cc46eceecb5424",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6af7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615081",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_3_5_100_35000_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/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xad91",
-                    "hash" : "0xeb32d1393e5af2e15356cbf4cc9f3f62304433ba6f71d978674edf5c3bd55699",
-                    "mixHash" : "0x5070ab2432740667714e61accfdc7041f44d295379e224c043ee2f95be515041",
-                    "nonce" : "0x0bc35616944d3993",
+                    "hash" : "0x517b546ebde85cc281ab34dfde9c065ec0f2447a7f22973ff0d2d514a0b7e3d6",
+                    "mixHash" : "0x0f39937f60abe188f360e29e1c47aea3d78220c9a15ae70fc610100c12de9962",
+                    "nonce" : "0xcb5b7dc2a03b022c",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a05070ab2432740667714e61accfdc7041f44d295379e224c043ee2f95be515041880bc35616944d3993f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a00f39937f60abe188f360e29e1c47aea3d78220c9a15ae70fc610100c12de996288cb5b7dc2a03b022cf90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb32d1393e5af2e15356cbf4cc9f3f62304433ba6f71d978674edf5c3bd55699",
-        "network" : "EIP158",
+        "lastblockhash" : "0x517b546ebde85cc281ab34dfde9c065ec0f2447a7f22973ff0d2d514a0b7e3d6",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_3_5_100_35000_d0g0v0_Frontier" : {
+    "modexp_3_5_100_35000_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/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe0d0",
-                    "hash" : "0xabe2e391d21a6e2ec38247262d0bb4d5896e2d5b7595bb1477577866fe407afa",
-                    "mixHash" : "0x38c4ca734c8680036d6bd16ae79c6ccbb419927524bd1828a5fdf59b4b58ae5d",
-                    "nonce" : "0xb7d239eb6bf1fcaf",
+                    "gasUsed" : "0xad91",
+                    "hash" : "0x6b621432198bc9f5754d69ca3eca124e7e68c7aa7ac80c370a407ec82fc4c631",
+                    "mixHash" : "0x418f3926bfe7a2cbd01919e5860c30dc3863126f1ab1909b9fc134bd74383572",
+                    "nonce" : "0xb8e39765f95d8b36",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xd963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93",
-                    "stateRoot" : "0xecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629b",
+                    "receiptTrie" : "0xe4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6",
+                    "stateRoot" : "0xd302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a038c4ca734c8680036d6bd16ae79c6ccbb419927524bd1828a5fdf59b4b58ae5d88b7d239eb6bf1fcaff90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d302b065691b2dd0382591a561c637dbee014896562b9b182efd2cd78f5f8dd3a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e4180dba4c749b75b0c55558ade768a2fa518879880b367a0904d07e4371fde6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a0418f3926bfe7a2cbd01919e5860c30dc3863126f1ab1909b9fc134bd7438357288b8e39765f95d8b36f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xabe2e391d21a6e2ec38247262d0bb4d5896e2d5b7595bb1477577866fe407afa",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6b621432198bc9f5754d69ca3eca124e7e68c7aa7ac80c370a407ec82fc4c631",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e2be",
+                "balance" : "0x4563918244f6af7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611d42",
+                "balance" : "0x0de0b6b3a7615081",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_3_5_100_35000_d0g0v0_Homestead" : {
+    "modexp_3_5_100_35000_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/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe0d0",
-                    "hash" : "0x80f6d5b9dded54c8fa398125b19e572b987ba555d070044570c3d05d5e34df53",
-                    "mixHash" : "0x39b8692983262926d3d80ea5645016e1cd8150e9b92e3bfb308cc039576dc2c6",
-                    "nonce" : "0xcc15127fd2651036",
+                    "hash" : "0xd909a933a7c7fd43799bae7f3867d4754077f44562641872a8360eb5645759e7",
+                    "mixHash" : "0x6e717aea448b26446ee00b0b5c0ce67381b483c20884a7d48f52c63c88229beb",
+                    "nonce" : "0x1a41c9d3963cde09",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
                     "receiptTrie" : "0xd963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a039b8692983262926d3d80ea5645016e1cd8150e9b92e3bfb308cc039576dc2c688cc15127fd2651036f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a06e717aea448b26446ee00b0b5c0ce67381b483c20884a7d48f52c63c88229beb881a41c9d3963cde09f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80f6d5b9dded54c8fa398125b19e572b987ba555d070044570c3d05d5e34df53",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd909a933a7c7fd43799bae7f3867d4754077f44562641872a8360eb5645759e7",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_3_5_100_35000_d0g0v0_Metropolis" : {
+    "modexp_3_5_100_35000_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/stPreCompiledContracts/modexp_3_5_100_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xad91",
-                    "hash" : "0x9e96677d44acb3f13e42087ef00f4ffe3b77c7f60b34dbdbb5e4c99fa485b6fb",
-                    "mixHash" : "0x8de538e9bf399fc632a9814ac57ca18e196b6c998f52c025d1c4ba6727dbf1ca",
-                    "nonce" : "0xf0dacdd2b15e5a06",
+                    "gasUsed" : "0xe0d0",
+                    "hash" : "0x1e744d14c641f495e063b6094faee327cd14364af52ee5c71290f4606a81302f",
+                    "mixHash" : "0x27fcd467a6b1e60790a974811b79f3cfc01e0856c6ddcd036ad8de9cda04f045",
+                    "nonce" : "0x04d7cd6e1710e531",
                     "number" : "0x01",
                     "parentHash" : "0xe53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323",
-                    "receiptTrie" : "0xe3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6",
-                    "stateRoot" : "0x112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0",
+                    "receiptTrie" : "0xd963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93",
+                    "stateRoot" : "0xecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0112071e69fdb51823e85fc908fe75087cec5108a8abd65c5e5ead0dd777b16c0a0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0e3c462c239fad6d3df5e66b2d9880036ca38b4a581674e439d425b540bb2f4b6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ad918203e880a08de538e9bf399fc632a9814ac57ca18e196b6c998f52c025d1c4ba6727dbf1ca88f0dacdd2b15e5a06f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
+                "rlp" : "0xf90326f901f8a0e53bc059c0ab1f08cbe0f5ecb0eb7f6e0db4b8d600acc5b6f1af8fc463363323a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ecb5286cb2fd569873a32987a8cbdc1b4537b2a4cc4ba71aa00b9b910658629ba0714aee2c3eac27f8725ad92e6e20ff8318d400cbd1a9c487397b03d589a55e92a0d963f45c52c152e564081ce8e729073da08481bb5ae128a036db5d224114aa93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e0d08203e880a027fcd467a6b1e60790a974811b79f3cfc01e0856c6ddcd036ad8de9cda04f0458804d7cd6e1710e531f90127f90124010182e0d094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103056400000000000000000000000000000000000000000000000000000000001ba0dba9f76c6c3ee2fcd76000f377ed45071433a0325567e9c2eb7cc5284c535c0da03ac93f15b753082f0e2b6930bf596cbc810e9b6ec0249af521dc20c16ffe4ad9c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06dbb1656180a0ac8db14eca34dc922806a37994ed251b9b9a32e8a77f0ef61faa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e96677d44acb3f13e42087ef00f4ffe3b77c7f60b34dbdbb5e4c99fa485b6fb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1e744d14c641f495e063b6094faee327cd14364af52ee5c71290f4606a81302f",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6af7f",
+                "balance" : "0x4563918244f6e2be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615081",
+                "balance" : "0x0de0b6b3a7611d42",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json
index 49120fe67..4955635a8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_49_2401_2401_1000000_d0g0v0_EIP150" : {
+    "modexp_49_2401_2401_1000000_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/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0xe388ff6ad3d06876d05e1dbb10a27b5635d34c028459a2c4e00512469b63754b",
-                    "mixHash" : "0xfb87789dd9cf61d753e4e30ccb0a41d498d0b91d1f63dc5af9b647a4dfc3090f",
-                    "nonce" : "0x3652baf59e94012a",
+                    "hash" : "0x7e288f76a3c3cdb7790a18051dd8df62365138b0136bd156e5bbac792f95e23c",
+                    "mixHash" : "0xb5865ffcaf3bae6ab856b5b25ce4f217e1349e2c5d9c0fd627c2a6aed7d742ae",
+                    "nonce" : "0xc7511c90acba9a05",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
-                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0fb87789dd9cf61d753e4e30ccb0a41d498d0b91d1f63dc5af9b647a4dfc3090f883652baf59e94012af90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0b5865ffcaf3bae6ab856b5b25ce4f217e1349e2c5d9c0fd627c2a6aed7d742ae88c7511c90acba9a05f90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe388ff6ad3d06876d05e1dbb10a27b5635d34c028459a2c4e00512469b63754b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7e288f76a3c3cdb7790a18051dd8df62365138b0136bd156e5bbac792f95e23c",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6afff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_49_2401_2401_1000000_d0g0v0_EIP158" : {
+    "modexp_49_2401_2401_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x1e5c340eb8a2ded35ec300bf4d83fc3ac0b5f1d51a08be136b916c242c9daab6",
+                    "mixHash" : "0x4a940fea9d98174e99c6b50ea3580dc041e7a4ba68ef086d01085d656bc2dceb",
+                    "nonce" : "0x209bbd08b10344e3",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a04a940fea9d98174e99c6b50ea3580dc041e7a4ba68ef086d01085d656bc2dceb88209bbd08b10344e3f90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0f9ad8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xdca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3",
+                        "s" : "0x724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4ab",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1e5c340eb8a2ded35ec300bf4d83fc3ac0b5f1d51a08be136b916c242c9daab6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6afff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615001",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_49_2401_2401_1000000_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/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x2f3dbe0b9047fea8673be8ebe96de4c72f3c0977da3763210b7b5a400101befd",
-                    "mixHash" : "0x8224fbef5c073c1f2ad48f9bfe58ea1f309f1d5e31a1f48b668f65263496bb2e",
-                    "nonce" : "0xf5afeece7d10e5a4",
+                    "hash" : "0x90c9a3f99affd03889a6b1555890bb23d58570e6f185a31d4007b49172b7dc8e",
+                    "mixHash" : "0x26b81025ec4c8ab2211bf21e4cedd753f8f5bf9f75e0d8b7e4f55923ad5a6327",
+                    "nonce" : "0x7b16ffc8d41aa2ff",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a08224fbef5c073c1f2ad48f9bfe58ea1f309f1d5e31a1f48b668f65263496bb2e88f5afeece7d10e5a4f90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a026b81025ec4c8ab2211bf21e4cedd753f8f5bf9f75e0d8b7e4f55923ad5a6327887b16ffc8d41aa2fff90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f3dbe0b9047fea8673be8ebe96de4c72f3c0977da3763210b7b5a400101befd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x90c9a3f99affd03889a6b1555890bb23d58570e6f185a31d4007b49172b7dc8e",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_1000000_d0g0v0_Frontier" : {
+    "modexp_49_2401_2401_1000000_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/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0f9ad8",
-                    "hash" : "0xbdb8854eb70bdbb62617cdf5315086873acc17432b1acd863ec89b9c1f15e123",
-                    "mixHash" : "0x80ffeed8de3284bde5be3d8c3d16b6771f52eb2a3486470da1061c4387afb23a",
-                    "nonce" : "0xdc36b1ad2078078d",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x4a4287ca49ac073b895fa577b397ca948582b59b8f97199caff7f95f9697d0e0",
+                    "mixHash" : "0xdafe701be9178bc501bb2190eb7b046e5ec71b7f1393c9337e1218cf9c5eb064",
+                    "nonce" : "0x2fcb9c3e4c1da85d",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x8569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2",
-                    "stateRoot" : "0x63745016ae7cb0e28f8e0f8c9525c705c33f7293697e578bc2bc3bcbd5e7b4f4",
+                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
+                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a063745016ae7cb0e28f8e0f8c9525c705c33f7293697e578bc2bc3bcbd5e7b4f4a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea08569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9ad88203e880a080ffeed8de3284bde5be3d8c3d16b6771f52eb2a3486470da1061c4387afb23a88dc36b1ad2078078df90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0dafe701be9178bc501bb2190eb7b046e5ec71b7f1393c9337e1218cf9c5eb064882fcb9c3e4c1da85df90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdb8854eb70bdbb62617cdf5315086873acc17432b1acd863ec89b9c1f15e123",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4a4287ca49ac073b895fa577b397ca948582b59b8f97199caff7f95f9697d0e0",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918245059cc6",
+                "balance" : "0x4563918244f6afff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a752633a",
+                "balance" : "0x0de0b6b3a7615001",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_1000000_d0g0v0_Homestead" : {
+    "modexp_49_2401_2401_1000000_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/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0f9ad8",
-                    "hash" : "0x36618c47ef2a4a5cc02d47557c3bc2458fdad98b9530bde46b7a640108b237c1",
-                    "mixHash" : "0x93e8c1b1811bea6f84048adbe7829e015daf0f2cb82d75f2242f6b22ee4e5888",
-                    "nonce" : "0xc895f30fd6b52358",
+                    "hash" : "0x2a6d3b191f787fd0e648f73fcea18e07be51198df15f2b08c1bfe15a17c75b7b",
+                    "mixHash" : "0x75a8e6da355e80a1a219b9e947b7f29b8e9ae10d5aede14766a435ba0e6f064b",
+                    "nonce" : "0xea4b392a9c9621ce",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x8569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a063745016ae7cb0e28f8e0f8c9525c705c33f7293697e578bc2bc3bcbd5e7b4f4a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea08569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9ad88203e880a093e8c1b1811bea6f84048adbe7829e015daf0f2cb82d75f2242f6b22ee4e588888c895f30fd6b52358f90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a063745016ae7cb0e28f8e0f8c9525c705c33f7293697e578bc2bc3bcbd5e7b4f4a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea08569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9ad88203e880a075a8e6da355e80a1a219b9e947b7f29b8e9ae10d5aede14766a435ba0e6f064b88ea4b392a9c9621cef90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36618c47ef2a4a5cc02d47557c3bc2458fdad98b9530bde46b7a640108b237c1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2a6d3b191f787fd0e648f73fcea18e07be51198df15f2b08c1bfe15a17c75b7b",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_1000000_d0g0v0_Metropolis" : {
+    "modexp_49_2401_2401_1000000_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/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae11",
-                    "hash" : "0xd9e0c487811a4386ebd5bdba96debd8d1d55494fe974f4ab3bae8b314f376f8c",
-                    "mixHash" : "0x28daa754b79efdb056a3c18725510eea0c236c13e9b5453ed5e568ea18d46f16",
-                    "nonce" : "0x61efdc30ef9e8fd2",
+                    "gasUsed" : "0x0f9ad8",
+                    "hash" : "0x8b53ae7141247b4c9f36c6331f917fc8faaf9b0a729479a39397f72e9cc35e48",
+                    "mixHash" : "0x821c31104ac4e57ef9027def66eb14cf0cc1bc680c471ba897b470a2948347b9",
+                    "nonce" : "0x795436a3e3d9f1c1",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
-                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "receiptTrie" : "0x8569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2",
+                    "stateRoot" : "0x63745016ae7cb0e28f8e0f8c9525c705c33f7293697e578bc2bc3bcbd5e7b4f4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a028daa754b79efdb056a3c18725510eea0c236c13e9b5453ed5e568ea18d46f168861efdc30ef9e8fd2f90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
+                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a063745016ae7cb0e28f8e0f8c9525c705c33f7293697e578bc2bc3bcbd5e7b4f4a0d2dc67fff0b47fe7eb4b6478388102b238934cb8bd6df786f6f4664cc147f23ea08569254195a45a944bbca06f97a004c538ec66a9776021f15a274f54075eb2c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830f9ad88203e880a0821c31104ac4e57ef9027def66eb14cf0cc1bc680c471ba897b470a2948347b988795436a3e3d9f1c1f90128f901250101830f9ad894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba0dca8d86f9ecfab4255391488ca9cec86587212248c4b6b2a22cf0387fece23c3a0724d1ed190b546e11d020a5b5600a06952742e9c2443e61cf46438d26321c4abc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9e0c487811a4386ebd5bdba96debd8d1d55494fe974f4ab3bae8b314f376f8c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8b53ae7141247b4c9f36c6331f917fc8faaf9b0a729479a39397f72e9cc35e48",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6afff",
+                "balance" : "0x4563918245059cc6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615001",
+                "balance" : "0x0de0b6b3a752633a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json
index 0314b116e..916e9318f 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_49_2401_2401_155000_d0g0v0_EIP150" : {
+    "modexp_49_2401_2401_155000_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/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x519ff26266b21511b359ab165f6cd58225592e998e8144ec32a7d80c877742e1",
-                    "mixHash" : "0x8abe7a3b60897d29ff8940efb23a25ec7a34b5fe6e4aad0521719cdfde7467cf",
-                    "nonce" : "0xb93a22b900db9767",
+                    "hash" : "0xe420316851451996835d284a621a476731a9209152752f3fcf882e0be629492a",
+                    "mixHash" : "0xc3497559dfd3f9ebdcd7ad189121b2e2c7b680b85af9ae800995cc0eac7962e5",
+                    "nonce" : "0x436db6e4aa6d1dd4",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
-                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a08abe7a3b60897d29ff8940efb23a25ec7a34b5fe6e4aad0521719cdfde7467cf88b93a22b900db9767f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0c3497559dfd3f9ebdcd7ad189121b2e2c7b680b85af9ae800995cc0eac7962e588436db6e4aa6d1dd4f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x519ff26266b21511b359ab165f6cd58225592e998e8144ec32a7d80c877742e1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe420316851451996835d284a621a476731a9209152752f3fcf882e0be629492a",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6afff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_49_2401_2401_155000_d0g0v0_EIP158" : {
+    "modexp_49_2401_2401_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0xf293f96596bc53f98788e4c731db71b1f30ffe16b29117f0e2d8c55310aade72",
+                    "mixHash" : "0xd4a1f6bf36b13cc9608c3531b1f27218d1b7f38504be2e0ed3d782aeb2229894",
+                    "nonce" : "0x84c58db20805aa1c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0d4a1f6bf36b13cc9608c3531b1f27218d1b7f38504be2e0ed3d782aeb22298948884c58db20805aa1cf90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02b610",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x11b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797c",
+                        "s" : "0x2b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf293f96596bc53f98788e4c731db71b1f30ffe16b29117f0e2d8c55310aade72",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6afff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615001",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_49_2401_2401_155000_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/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x1a361784a6a318c77a8bcf8edfa561894f96f5f5c6f9d9e133c0f2af326630e0",
-                    "mixHash" : "0xd606f6d19bbfb8f7b8e6ee61458327441877db3f415cb8be0fbc9498732ff4e3",
-                    "nonce" : "0xe7b7262fec7f2827",
+                    "hash" : "0xb8075f1195b14c68cb88baa6da7c40df08fbd3b5d87e35d9529a549a7b5543b7",
+                    "mixHash" : "0x155878f4d7e1bf3e87d936e9189190439b9f03bb5eacbed4b104ed837af32d81",
+                    "nonce" : "0xd245fa81ccf4e1c6",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0d606f6d19bbfb8f7b8e6ee61458327441877db3f415cb8be0fbc9498732ff4e388e7b7262fec7f2827f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0155878f4d7e1bf3e87d936e9189190439b9f03bb5eacbed4b104ed837af32d8188d245fa81ccf4e1c6f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a361784a6a318c77a8bcf8edfa561894f96f5f5c6f9d9e133c0f2af326630e0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb8075f1195b14c68cb88baa6da7c40df08fbd3b5d87e35d9529a549a7b5543b7",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_155000_d0g0v0_Frontier" : {
+    "modexp_49_2401_2401_155000_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/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02b610",
-                    "hash" : "0x16db36d3d618b46ec2f6b0c25571b081287cdb4ff428b69b6921887ea620a1c2",
-                    "mixHash" : "0x9956ef67622c07ff702b3d3514030baa7bd6f2e1dfab57953baaa336bacdf71e",
-                    "nonce" : "0xac97aa3ddf2ed1f6",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x5c2abf31b894e96d24b3596f8c8ea293607a1b8c90163aa7055548371a7e2d28",
+                    "mixHash" : "0xc070b07102f05d7ea78c200022862a572e80039cb073e66eeb2a458d069eb8a4",
+                    "nonce" : "0xc159924de0aa73e5",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x2413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1",
-                    "stateRoot" : "0xb16b3ee40952d2b3e896e216b6e734ae45a4f9cd5167945652bd8a7f8a7eaa13",
+                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
+                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b16b3ee40952d2b3e896e216b6e734ae45a4f9cd5167945652bd8a7f8a7eaa13a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a02413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6108203e880a09956ef67622c07ff702b3d3514030baa7bd6f2e1dfab57953baaa336bacdf71e88ac97aa3ddf2ed1f6f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0c070b07102f05d7ea78c200022862a572e80039cb073e66eeb2a458d069eb8a488c159924de0aa73e5f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16db36d3d618b46ec2f6b0c25571b081287cdb4ff428b69b6921887ea620a1c2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5c2abf31b894e96d24b3596f8c8ea293607a1b8c90163aa7055548371a7e2d28",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8b7fe",
+                "balance" : "0x4563918244f6afff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f4802",
+                "balance" : "0x0de0b6b3a7615001",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_155000_d0g0v0_Homestead" : {
+    "modexp_49_2401_2401_155000_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/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02b610",
-                    "hash" : "0xdee24bd1982eb923f9e31b1ab0d51f3c119f14caa5b104e1df2f6a81302d994f",
-                    "mixHash" : "0x8be2cb4381357b2f19e2ed4d5a1c192bce6d38dcc937a964ccc9219d072ee50c",
-                    "nonce" : "0xf0f053085cbf056c",
+                    "hash" : "0x5614b3cf48fe099734fa035a6bee1cd4d26f12d23d65ef5dabbd92f152742f37",
+                    "mixHash" : "0x0d5deaf6deacdf9d35d5a68d2a165072afe78b8ae2759181129823722a26dc3e",
+                    "nonce" : "0x912a29a0f506928d",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x2413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b16b3ee40952d2b3e896e216b6e734ae45a4f9cd5167945652bd8a7f8a7eaa13a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a02413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6108203e880a08be2cb4381357b2f19e2ed4d5a1c192bce6d38dcc937a964ccc9219d072ee50c88f0f053085cbf056cf90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b16b3ee40952d2b3e896e216b6e734ae45a4f9cd5167945652bd8a7f8a7eaa13a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a02413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6108203e880a00d5deaf6deacdf9d35d5a68d2a165072afe78b8ae2759181129823722a26dc3e88912a29a0f506928df90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdee24bd1982eb923f9e31b1ab0d51f3c119f14caa5b104e1df2f6a81302d994f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5614b3cf48fe099734fa035a6bee1cd4d26f12d23d65ef5dabbd92f152742f37",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_155000_d0g0v0_Metropolis" : {
+    "modexp_49_2401_2401_155000_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/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae11",
-                    "hash" : "0xcee5fc2ef41360d50a8d04f2a480fdb0cbd63fa8d265392673886a07d8b77c7f",
-                    "mixHash" : "0x3bfac1881fa3ea1619eef507a623b6a6d4561132907d1d0687106959d9a20f93",
-                    "nonce" : "0x953033095b383418",
+                    "gasUsed" : "0x02b610",
+                    "hash" : "0x2e1ec62f92d5051935ce01fdf11e55ef5a40f6565504e06859773ba333f86962",
+                    "mixHash" : "0x6cac506c6545ea08125fc675ed4797ec319ce7e20f934fd40ee58230ddd358c5",
+                    "nonce" : "0xcdc83576ac5606ff",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
-                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "receiptTrie" : "0x2413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1",
+                    "stateRoot" : "0xb16b3ee40952d2b3e896e216b6e734ae45a4f9cd5167945652bd8a7f8a7eaa13",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90327f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a03bfac1881fa3ea1619eef507a623b6a6d4561132907d1d0687106959d9a20f9388953033095b383418f90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
+                "rlp" : "0xf90328f901f9a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b16b3ee40952d2b3e896e216b6e734ae45a4f9cd5167945652bd8a7f8a7eaa13a02b3ad4866f0caa5098db9b523cd957425425d8c1de63a462227a979b1730f870a02413b547e5f2c4a1ad29107f3799892a1a1cafda32fd6a57f5f056714196b5f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302b6108203e880a06cac506c6545ea08125fc675ed4797ec319ce7e20f934fd40ee58230ddd358c588cdc83576ac5606fff90128f9012501018302b61094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca011b0cbadf00e26c723e2c51b538a0a83a6ad97c0ba3518f92a52a75c7758797ca02b44b141ed163880d1b5cb3d04eab49c6abda00a3a845a26a26b22284e644cf6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcee5fc2ef41360d50a8d04f2a480fdb0cbd63fa8d265392673886a07d8b77c7f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2e1ec62f92d5051935ce01fdf11e55ef5a40f6565504e06859773ba333f86962",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6afff",
+                "balance" : "0x4563918244f8b7fe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615001",
+                "balance" : "0x0de0b6b3a75f4802",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json
index 38996150a..cbe7f8aa6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_49_2401_2401_20500_d0g0v0_EIP150" : {
+    "modexp_49_2401_2401_20500_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/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8ac",
-                    "hash" : "0xde7e8791bf9f852aa7c448287babdd898a182b3e9697a57fba789f7d07ea4fb2",
-                    "mixHash" : "0xe21f999c2b1783cdd1ee96178a832ec852e271f1fd237f93309ae41127da9b5c",
-                    "nonce" : "0x2b8764c1ad5439e2",
+                    "hash" : "0x2c5cf2e5d096f772d5eaf4e369843e1d034ba1fc61b4d43eec984b59bb5cdbad",
+                    "mixHash" : "0x9b88b6c6131b4ca1f1a4b7d1a0ee7e0daca5b834d61dfa03e76830f6171fed5b",
+                    "nonce" : "0xb98160599117ab5e",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x71064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730c",
-                    "stateRoot" : "0xd09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477",
+                    "receiptTrie" : "0xf5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5d",
+                    "stateRoot" : "0x78b48680a1e4a3ee065a8ed1ca775fb8bb5d4d088911ad0441305c7f7be50c03",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a0e21f999c2b1783cdd1ee96178a832ec852e271f1fd237f93309ae41127da9b5c882b8764c1ad5439e2f90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a078b48680a1e4a3ee065a8ed1ca775fb8bb5d4d088911ad0441305c7f7be50c03a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea0f5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a09b88b6c6131b4ca1f1a4b7d1a0ee7e0daca5b834d61dfa03e76830f6171fed5b88b98160599117ab5ef90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde7e8791bf9f852aa7c448287babdd898a182b3e9697a57fba789f7d07ea4fb2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2c5cf2e5d096f772d5eaf4e369843e1d034ba1fc61b4d43eec984b59bb5cdbad",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aa9a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_20500_d0g0v0_EIP158" : {
+    "modexp_49_2401_2401_20500_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/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8ac",
-                    "hash" : "0x50dc97dda336517dd3fbf3c053096efe092e67c6a1990b00405778879975713a",
-                    "mixHash" : "0x7541e9cf0f2a3ff0f47b70b44a5e4ce666ddfcfaad23e4c16d9a7b896548ea49",
-                    "nonce" : "0x18092645db5d280d",
+                    "hash" : "0x88b566ba3516ab2c4ef4942c2c21180a8047a7380bdfbbafbac93ed67db6c09c",
+                    "mixHash" : "0xde107b4325cd6df205acae5a1a426c49b78563001a093e63482543109f245493",
+                    "nonce" : "0xe723ac2e45d0064e",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x71064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730c",
-                    "stateRoot" : "0xd09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477",
+                    "receiptTrie" : "0xf5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5d",
+                    "stateRoot" : "0x78b48680a1e4a3ee065a8ed1ca775fb8bb5d4d088911ad0441305c7f7be50c03",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a07541e9cf0f2a3ff0f47b70b44a5e4ce666ddfcfaad23e4c16d9a7b896548ea498818092645db5d280df90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a078b48680a1e4a3ee065a8ed1ca775fb8bb5d4d088911ad0441305c7f7be50c03a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea0f5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a0de107b4325cd6df205acae5a1a426c49b78563001a093e63482543109f24549388e723ac2e45d0064ef90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50dc97dda336517dd3fbf3c053096efe092e67c6a1990b00405778879975713a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x88b566ba3516ab2c4ef4942c2c21180a8047a7380bdfbbafbac93ed67db6c09c",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6aa9a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_20500_d0g0v0_Frontier" : {
+    "modexp_49_2401_2401_20500_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/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8ac",
-                    "hash" : "0xdf6c4ce9732b55e5a7fb4913f4259cb9f84cccee3fd03ae4ee7a2645cf8851cc",
-                    "mixHash" : "0x0a854c6c7eed643ffb1771b130e3f991a3ae52cbf3ebf9b61ece50960fed4f04",
-                    "nonce" : "0x32535b5a98e16caf",
+                    "hash" : "0x31b8b00b56ff5b1b7b279f268bd6cff2126456849e2745fc6f91c95881b6b1c1",
+                    "mixHash" : "0x9b5871f3bd2b9ba80ac17628c72dd9936099ff733ed916b999a6b44de56eabb5",
+                    "nonce" : "0x1e47858f53f1a188",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x71064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730c",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a00a854c6c7eed643ffb1771b130e3f991a3ae52cbf3ebf9b61ece50960fed4f048832535b5a98e16caff90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a09b5871f3bd2b9ba80ac17628c72dd9936099ff733ed916b999a6b44de56eabb5881e47858f53f1a188f90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf6c4ce9732b55e5a7fb4913f4259cb9f84cccee3fd03ae4ee7a2645cf8851cc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x31b8b00b56ff5b1b7b279f268bd6cff2126456849e2745fc6f91c95881b6b1c1",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_20500_d0g0v0_Homestead" : {
+    "modexp_49_2401_2401_20500_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/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8ac",
-                    "hash" : "0x4e7d4afe2b12fa727132a663ed83fb2419d9446395124f4aafb097abf6e50029",
-                    "mixHash" : "0x1790426b18225def9abee0f800478d8dbf8a136d08b5326d9f97a15d9c3bbee5",
-                    "nonce" : "0xab008e60c76c74f1",
+                    "hash" : "0x26ed0b66510dca41f8fbeceffbd210791ed59926c3d2d4defdb6cb9242830270",
+                    "mixHash" : "0x76589c448f5d05cbb75b585e708be2b81403dfd41291a2b4a373dd1c04905cb6",
+                    "nonce" : "0xf0d7ab4b24b3231f",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x71064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730c",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a01790426b18225def9abee0f800478d8dbf8a136d08b5326d9f97a15d9c3bbee588ab008e60c76c74f1f90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a076589c448f5d05cbb75b585e708be2b81403dfd41291a2b4a373dd1c04905cb688f0d7ab4b24b3231ff90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e7d4afe2b12fa727132a663ed83fb2419d9446395124f4aafb097abf6e50029",
-        "network" : "Homestead",
+        "lastblockhash" : "0x26ed0b66510dca41f8fbeceffbd210791ed59926c3d2d4defdb6cb9242830270",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_20500_d0g0v0_Metropolis" : {
+    "modexp_49_2401_2401_20500_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/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8ac",
-                    "hash" : "0x9539dcc318bb57197bc5f698714c2d0563d4922f6cdd6a5e3f7bdf72b03faeee",
-                    "mixHash" : "0x49960d4e17ccd0629516013ddbeea33086c4cdf7c0090cb8b692d531108fb32b",
-                    "nonce" : "0x38f79d275d9b563c",
+                    "hash" : "0xfe635f626283ff5748d51beb56e7a88d3e59cde90dbf39b0c45672eb4f4779ba",
+                    "mixHash" : "0x8b4288a1c4c18c1db217d0a507ad15491797a4715818ca52c2508fbec15cc230",
+                    "nonce" : "0x3abd0a660ddc2119",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xf5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5d",
-                    "stateRoot" : "0x78b48680a1e4a3ee065a8ed1ca775fb8bb5d4d088911ad0441305c7f7be50c03",
+                    "receiptTrie" : "0x71064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730c",
+                    "stateRoot" : "0xd09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a078b48680a1e4a3ee065a8ed1ca775fb8bb5d4d088911ad0441305c7f7be50c03a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea0f5a2cfc96097dbe9e86f4a5c030ce4d35c30103fee5dcb55b72d6383570e3f5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a049960d4e17ccd0629516013ddbeea33086c4cdf7c0090cb8b692d531108fb32b8838f79d275d9b563cf90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a08b4288a1c4c18c1db217d0a507ad15491797a4715818ca52c2508fbec15cc230883abd0a660ddc2119f90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9539dcc318bb57197bc5f698714c2d0563d4922f6cdd6a5e3f7bdf72b03faeee",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfe635f626283ff5748d51beb56e7a88d3e59cde90dbf39b0c45672eb4f4779ba",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6aa9a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615566",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_49_2401_2401_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa8ac",
+                    "hash" : "0xfd303a1047c07399bfc648881acfb41204d48cf1243e5d2ede1b0351419cfda7",
+                    "mixHash" : "0xa9430c799f913838e524fce334581b1955dd1052a8f4d4f0ade037bda8a7acf2",
+                    "nonce" : "0xb390fbb8e8713e64",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0x71064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730c",
+                    "stateRoot" : "0xd09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d09148757d82d1adf6e5d0eb4b5b486cb427732ad1855d5076659f25bd1a3477a0d1c1a417285975967a674aa230d24dbdb4193dc6307f167e466bd8e9aaa18b4ea071064bbdb1030cce6d9ff07730c609f3ebb7ea74a66c66e275fde6ae7a11730cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8ac8203e880a0a9430c799f913838e524fce334581b1955dd1052a8f4d4f0ade037bda8a7acf288b390fbb8e8713e64f90127f90124010182a8ac94c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ca0bcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5a024faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xa8ac",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xbcad13a8ab619a2236ce3a99795b6047fdb3e1b0670b1618f50d512c315a02d5",
+                        "s" : "0x24faaebc035b682b308e8d42ec5eda1597a8a23fea62c8bd540c2b94ebe62637",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfd303a1047c07399bfc648881acfb41204d48cf1243e5d2ede1b0351419cfda7",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json
index 4b6b7421f..ad4e01fc2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_49_2401_2401_22000_d0g0v0_EIP150" : {
+    "modexp_49_2401_2401_22000_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/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0xab7c0c258fd334569c4d3fbe407cb2239f8d9d368018f1b91ec1b1862bbcf09a",
-                    "mixHash" : "0x4b073587d2c2f48bc96a6ac9513c50a37ea5aed594a448a7654f9b7b7a27095c",
-                    "nonce" : "0x0638eef32548e61e",
+                    "hash" : "0x34c9b5f6820e782389f0964dd9b7670c1f1973397fdf9620ca579556e184043e",
+                    "mixHash" : "0x51f32b669997db96e0f8ab689c511324de78a8e9c4b107dcc32e4819b29748d8",
+                    "nonce" : "0x95172afb8d20e4c5",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
-                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a04b073587d2c2f48bc96a6ac9513c50a37ea5aed594a448a7654f9b7b7a27095c880638eef32548e61ef90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a051f32b669997db96e0f8ab689c511324de78a8e9c4b107dcc32e4819b29748d88895172afb8d20e4c5f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab7c0c258fd334569c4d3fbe407cb2239f8d9d368018f1b91ec1b1862bbcf09a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x34c9b5f6820e782389f0964dd9b7670c1f1973397fdf9620ca579556e184043e",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6afff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_49_2401_2401_22000_d0g0v0_EIP158" : {
+    "modexp_49_2401_2401_22000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0xe4b07965cc72af571bcc09f6cbf1163f0a46de838825d31f32fb1c24ed789be0",
+                    "mixHash" : "0xdb3894b32224927d53418b328bc056f8110f89c6a1b79b7c547020ebf6171c05",
+                    "nonce" : "0xa7dcb4e687d41827",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0db3894b32224927d53418b328bc056f8110f89c6a1b79b7c547020ebf6171c0588a7dcb4e687d41827f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xae88",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x93790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844",
+                        "s" : "0x54e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccb",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe4b07965cc72af571bcc09f6cbf1163f0a46de838825d31f32fb1c24ed789be0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6afff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615001",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_49_2401_2401_22000_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/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x54220c39957d98eb946f856abf44114b3ca870889f9fa418bc68eddafdfe6baa",
-                    "mixHash" : "0x00fe9be7e182d027528778de4294e30b65f91d425253e34c1eaf947acc5cbb98",
-                    "nonce" : "0xaa37fa55ec262802",
+                    "hash" : "0x122bee97b575db38bb242da7d1a3cb7dc09132c96b325441de08e23582c78784",
+                    "mixHash" : "0x9ad266b7c4ce968aaa9fdbc3a073556101213413759ab4b38c6892599b18c666",
+                    "nonce" : "0x610d6c59fcdd3a9c",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a000fe9be7e182d027528778de4294e30b65f91d425253e34c1eaf947acc5cbb9888aa37fa55ec262802f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a09ad266b7c4ce968aaa9fdbc3a073556101213413759ab4b38c6892599b18c66688610d6c59fcdd3a9cf90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54220c39957d98eb946f856abf44114b3ca870889f9fa418bc68eddafdfe6baa",
-        "network" : "EIP158",
+        "lastblockhash" : "0x122bee97b575db38bb242da7d1a3cb7dc09132c96b325441de08e23582c78784",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_22000_d0g0v0_Frontier" : {
+    "modexp_49_2401_2401_22000_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/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae88",
-                    "hash" : "0x70d1defa410a812ef4c07f30c0a14a3c0f34c5434bd6cb58357a5732ac59a402",
-                    "mixHash" : "0xda16c93cea7f1a5fd99353ab63661c8fa40b26f0b9a872ebf3a242c1f3d5cb6c",
-                    "nonce" : "0x257f836b2cf5e59d",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0xc58f1ce69f35b1fe717b86f33165377bebd31a29c1faaa304a17b820ac4dc046",
+                    "mixHash" : "0x513a7728b2f6938dd0c90b8cc0be07ce0ac7d717d8701911cdeea2e2aaf8de9a",
+                    "nonce" : "0xe8177fbe158ced37",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xf3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906b",
-                    "stateRoot" : "0x085506cb17b78f0304e6c6f677f5f18d5f3299867d9efdb41a865d8e407700fa",
+                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
+                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0085506cb17b78f0304e6c6f677f5f18d5f3299867d9efdb41a865d8e407700faa0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0f3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae888203e880a0da16c93cea7f1a5fd99353ab63661c8fa40b26f0b9a872ebf3a242c1f3d5cb6c88257f836b2cf5e59df90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0513a7728b2f6938dd0c90b8cc0be07ce0ac7d717d8701911cdeea2e2aaf8de9a88e8177fbe158ced37f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70d1defa410a812ef4c07f30c0a14a3c0f34c5434bd6cb58357a5732ac59a402",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc58f1ce69f35b1fe717b86f33165377bebd31a29c1faaa304a17b820ac4dc046",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6b076",
+                "balance" : "0x4563918244f6afff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7614f8a",
+                "balance" : "0x0de0b6b3a7615001",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_22000_d0g0v0_Homestead" : {
+    "modexp_49_2401_2401_22000_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/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae88",
-                    "hash" : "0xc2db102ac052fc09cab3fad031946f736238663bb6264319f4772c2b07a6040d",
-                    "mixHash" : "0x780cb7e637f66d08fd6feb13cf6e09c7ba2931af1013b1b6d8bb93dd213799c6",
-                    "nonce" : "0x92b5a6bc63a95e58",
+                    "hash" : "0x47582b32178075fc8d0d2ec994c6bc8650547ccaf44322f33ec66646dddc7127",
+                    "mixHash" : "0x43c6b9d65b47bfae90d828c9b7154e1e6c0e06cd753193fc6e57aeb2599ff724",
+                    "nonce" : "0x3b842fcf4ed3a096",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0xf3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906b",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0085506cb17b78f0304e6c6f677f5f18d5f3299867d9efdb41a865d8e407700faa0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0f3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae888203e880a0780cb7e637f66d08fd6feb13cf6e09c7ba2931af1013b1b6d8bb93dd213799c68892b5a6bc63a95e58f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0085506cb17b78f0304e6c6f677f5f18d5f3299867d9efdb41a865d8e407700faa0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0f3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae888203e880a043c6b9d65b47bfae90d828c9b7154e1e6c0e06cd753193fc6e57aeb2599ff724883b842fcf4ed3a096f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2db102ac052fc09cab3fad031946f736238663bb6264319f4772c2b07a6040d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x47582b32178075fc8d0d2ec994c6bc8650547ccaf44322f33ec66646dddc7127",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_22000_d0g0v0_Metropolis" : {
+    "modexp_49_2401_2401_22000_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/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae11",
-                    "hash" : "0x068a334fb6e8aac1f876e3efcabf809001036a71d7ae6bf46948e5b5c9c90830",
-                    "mixHash" : "0x6ed766009c54cbabd08d619c455d8c2801b7582bd5fc0daa0bd0b027e87a83ab",
-                    "nonce" : "0xe712fe4696c09d5f",
+                    "gasUsed" : "0xae88",
+                    "hash" : "0x884ec5df6b20a5b5cddb62dee56547b0702fe270fe29d76c7a3098c5e7c16a5d",
+                    "mixHash" : "0x7f9ca39648a7c2655d3525d298e0bde0ca3e4e2cc31243a94e16696a77408b9c",
+                    "nonce" : "0x141c578c0bd05657",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
-                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "receiptTrie" : "0xf3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906b",
+                    "stateRoot" : "0x085506cb17b78f0304e6c6f677f5f18d5f3299867d9efdb41a865d8e407700fa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a06ed766009c54cbabd08d619c455d8c2801b7582bd5fc0daa0bd0b027e87a83ab88e712fe4696c09d5ff90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0085506cb17b78f0304e6c6f677f5f18d5f3299867d9efdb41a865d8e407700faa0116181ed0b51d72c1991c4485cb08e5049c33f8ba6bc4b1ec4c4f495bd1e1a39a0f3bbd7878520201703f0f45aadeabc2663c3d3b3f6659ea5e4da3a48387b906bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae888203e880a07f9ca39648a7c2655d3525d298e0bde0ca3e4e2cc31243a94e16696a77408b9c88141c578c0bd05657f90127f90124010182ae8894c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba093790f3968b2a9dc8608bd9b596554960387e632fd3cfdac2d28dfba397cb844a054e3164e1848b380f310f8e9b4e89a53cec4e275add4de749c5edc1b15161ccbc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x068a334fb6e8aac1f876e3efcabf809001036a71d7ae6bf46948e5b5c9c90830",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x884ec5df6b20a5b5cddb62dee56547b0702fe270fe29d76c7a3098c5e7c16a5d",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6afff",
+                "balance" : "0x4563918244f6b076",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615001",
+                "balance" : "0x0de0b6b3a7614f8a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json
index 2a2db1a58..78b19f04d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_49_2401_2401_25000_d0g0v0_EIP150" : {
+    "modexp_49_2401_2401_25000_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/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x4725f7a012d3795c5668ffdd87f56ec370e3febbc6cfc0539d663446c5172341",
-                    "mixHash" : "0x6719b658de025e03197987f79dd78a0e723d65ba0d79660110b368888d3f2885",
-                    "nonce" : "0x1999c78b5b347fdb",
+                    "hash" : "0x44bde329a27d4fe46e1d64539e43a0413fadd55b6fcbc9983f9ebe836605f3c2",
+                    "mixHash" : "0x7537ba2952ae0a0502a50b09f3d0af16a34cf9a9520266367219f75004cc40f2",
+                    "nonce" : "0x805ccd8f232a3a07",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
-                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a06719b658de025e03197987f79dd78a0e723d65ba0d79660110b368888d3f2885881999c78b5b347fdbf90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a07537ba2952ae0a0502a50b09f3d0af16a34cf9a9520266367219f75004cc40f288805ccd8f232a3a07f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4725f7a012d3795c5668ffdd87f56ec370e3febbc6cfc0539d663446c5172341",
-        "network" : "EIP150",
+        "lastblockhash" : "0x44bde329a27d4fe46e1d64539e43a0413fadd55b6fcbc9983f9ebe836605f3c2",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6afff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_49_2401_2401_25000_d0g0v0_EIP158" : {
+    "modexp_49_2401_2401_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x7f9b51518c1c453a1264e6fe3ef36a3cc1a06f6e512532b3ef265f4bbd807762",
+                    "mixHash" : "0x6ee57e073aa2e8849342c272db855921bbf7b112381d3f6122b2aa70b31caaf7",
+                    "nonce" : "0xe1df8e38d8d1cefb",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a06ee57e073aa2e8849342c272db855921bbf7b112381d3f6122b2aa70b31caaf788e1df8e38d8d1cefbf90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xba40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x98d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376",
+                        "s" : "0x337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7f9b51518c1c453a1264e6fe3ef36a3cc1a06f6e512532b3ef265f4bbd807762",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6afff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615001",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_49_2401_2401_25000_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/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x535c02703ec6e66a28e723de109f65c4503e689705219d666e9e00092cfd81f4",
-                    "mixHash" : "0x94d79171588ab71fc15610ebff8c17c2493594fa5788451cac92d61a9f2a1965",
-                    "nonce" : "0xe4df90891cc30c29",
+                    "hash" : "0x236c8b0f67f33ad972723d4bd3de02f034a20c168f3eb030d6a31102a280e2f1",
+                    "mixHash" : "0x88303bccafa1b19536e04d8f667d1f3d21071c9eb0bbb2095d6fabe8ad8f0d8a",
+                    "nonce" : "0xf59e8e76a00d6ce4",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a094d79171588ab71fc15610ebff8c17c2493594fa5788451cac92d61a9f2a196588e4df90891cc30c29f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a088303bccafa1b19536e04d8f667d1f3d21071c9eb0bbb2095d6fabe8ad8f0d8a88f59e8e76a00d6ce4f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x535c02703ec6e66a28e723de109f65c4503e689705219d666e9e00092cfd81f4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x236c8b0f67f33ad972723d4bd3de02f034a20c168f3eb030d6a31102a280e2f1",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_25000_d0g0v0_Frontier" : {
+    "modexp_49_2401_2401_25000_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/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xba40",
-                    "hash" : "0xd35a24fe5df1ed2afbd119cbd309935842a12f9ab49416ba03d8b7d8a320c83a",
-                    "mixHash" : "0x5786b225ea625d1845ba9d68b61a27abacf450cb63f82a5ae7567d79a51224a3",
-                    "nonce" : "0x31b8cff10f1a44cb",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x6e79ad60b9e11dc3c04d97c210ebbb962be22e5835f9fa6f1a1ef70236ca9048",
+                    "mixHash" : "0x63a85a6be8e3c69218a9a22afb12dee983b87a7e76b9a77a6ce670b065bd5ae3",
+                    "nonce" : "0xa18a0ee2ed322ff5",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xd268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292c",
-                    "stateRoot" : "0x6b9af3a3f57851f48acf953e36f5ec12fbcb0a0a840b3c6796be84844a5c628a",
+                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
+                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b9af3a3f57851f48acf953e36f5ec12fbcb0a0a840b3c6796be84844a5c628aa04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0d268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ba408203e880a05786b225ea625d1845ba9d68b61a27abacf450cb63f82a5ae7567d79a51224a38831b8cff10f1a44cbf90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a063a85a6be8e3c69218a9a22afb12dee983b87a7e76b9a77a6ce670b065bd5ae388a18a0ee2ed322ff5f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd35a24fe5df1ed2afbd119cbd309935842a12f9ab49416ba03d8b7d8a320c83a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6e79ad60b9e11dc3c04d97c210ebbb962be22e5835f9fa6f1a1ef70236ca9048",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6bc2e",
+                "balance" : "0x4563918244f6afff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a76143d2",
+                "balance" : "0x0de0b6b3a7615001",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_25000_d0g0v0_Homestead" : {
+    "modexp_49_2401_2401_25000_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/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xba40",
-                    "hash" : "0xc22c324d2daae5064fc7e653b99a907bccf409eba755fa5c55f4a62c9d1ce547",
-                    "mixHash" : "0xd068d96d6f45ae74212aff201205ad565702706e41974f4556ce2c9b5340a55a",
-                    "nonce" : "0xd5de262857cd300f",
+                    "hash" : "0xf8216bf6b399e88885e76a3784a573c2c34bdf58391a3a11d68ae104d639e1c6",
+                    "mixHash" : "0xfbd78dc4a716a59e05097dce5e405f2218266235e3bdd2c272b148129a9591ba",
+                    "nonce" : "0x5793f53356c62f37",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0xd268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292c",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b9af3a3f57851f48acf953e36f5ec12fbcb0a0a840b3c6796be84844a5c628aa04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0d268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ba408203e880a0d068d96d6f45ae74212aff201205ad565702706e41974f4556ce2c9b5340a55a88d5de262857cd300ff90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b9af3a3f57851f48acf953e36f5ec12fbcb0a0a840b3c6796be84844a5c628aa04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0d268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ba408203e880a0fbd78dc4a716a59e05097dce5e405f2218266235e3bdd2c272b148129a9591ba885793f53356c62f37f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc22c324d2daae5064fc7e653b99a907bccf409eba755fa5c55f4a62c9d1ce547",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf8216bf6b399e88885e76a3784a573c2c34bdf58391a3a11d68ae104d639e1c6",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_25000_d0g0v0_Metropolis" : {
+    "modexp_49_2401_2401_25000_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/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae11",
-                    "hash" : "0xda507b9b52a2287ab7c8008360e3bb57f001a412af9a823526da547a70264653",
-                    "mixHash" : "0x3fe1ff32fc513021260e3e01594802f0b8f50b8221e03f035a289fd1304c0385",
-                    "nonce" : "0xe1a4596d901b0eee",
+                    "gasUsed" : "0xba40",
+                    "hash" : "0x6f0218d94c4fd025ef45a6d3f589c46f454a5ac7478c794cec47fb5ea30b4b81",
+                    "mixHash" : "0xa78d6f6dbbe6447346756c6acd8b2c72221e1ee03c1fcf840d4cf89a7192b408",
+                    "nonce" : "0xaa98ce4c831de710",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
-                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "receiptTrie" : "0xd268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292c",
+                    "stateRoot" : "0x6b9af3a3f57851f48acf953e36f5ec12fbcb0a0a840b3c6796be84844a5c628a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a03fe1ff32fc513021260e3e01594802f0b8f50b8221e03f035a289fd1304c038588e1a4596d901b0eeef90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06b9af3a3f57851f48acf953e36f5ec12fbcb0a0a840b3c6796be84844a5c628aa04d8cdc0095a3b608bd0dc0f4cf1a14063244ed5766a97f49368f090d94e474eba0d268def8209ef51cfc59325652b59a9a362a6d871f10b380a6cbfc5681f7292cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ba408203e880a0a78d6f6dbbe6447346756c6acd8b2c72221e1ee03c1fcf840d4cf89a7192b40888aa98ce4c831de710f90127f90124010182ba4094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba098d72f445a1fbca44b2653de616f2670956025092452bd9f385358980a0e9376a0337bf1b625e6b0e794e3706eb305b1f32c18a46ab8ed721f8cb6f4aae3d221e0c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda507b9b52a2287ab7c8008360e3bb57f001a412af9a823526da547a70264653",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6f0218d94c4fd025ef45a6d3f589c46f454a5ac7478c794cec47fb5ea30b4b81",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6afff",
+                "balance" : "0x4563918244f6bc2e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615001",
+                "balance" : "0x0de0b6b3a76143d2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json
index a0d395488..a82bb09cc 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_49_2401_2401_35000_d0g0v0_EIP150" : {
+    "modexp_49_2401_2401_35000_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/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0xd25285ace8e788a422293f6565d26c6ff04fbc7bbfd8867dfe95e45a1608bdef",
-                    "mixHash" : "0x410a040332d4ae37a83a083148b539819925a2804ebca51dd700812d7dd5d1f3",
-                    "nonce" : "0x7c31383564977787",
+                    "hash" : "0xc43048b3e68abe75f3b6c3f7ecc799633887b529b4b3b80fdc5c9b61656224c1",
+                    "mixHash" : "0xd2b4e1d6169209fbc60fddd419e698e15ddfefac2fce6c23f73334bffd03ccc5",
+                    "nonce" : "0x32d7635ad6377a85",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
-                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0410a040332d4ae37a83a083148b539819925a2804ebca51dd700812d7dd5d1f3887c31383564977787f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0d2b4e1d6169209fbc60fddd419e698e15ddfefac2fce6c23f73334bffd03ccc58832d7635ad6377a85f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd25285ace8e788a422293f6565d26c6ff04fbc7bbfd8867dfe95e45a1608bdef",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc43048b3e68abe75f3b6c3f7ecc799633887b529b4b3b80fdc5c9b61656224c1",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6afff",
                 "code" : "",
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_49_2401_2401_35000_d0g0v0_EIP158" : {
+    "modexp_49_2401_2401_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x33e20fdd4c0efba38f8347467b10a565c958175ea05c8780596ef08803a0d995",
+                    "mixHash" : "0x1f21036d0d34285f9d3ffe6287572c94f49cf83f71b92c395168fe9b3a45ca91",
+                    "nonce" : "0x7ac04100af047952",
+                    "number" : "0x01",
+                    "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
+                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a01f21036d0d34285f9d3ffe6287572c94f49cf83f71b92c395168fe9b3a45ca91887ac04100af047952f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xe150",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x9c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77",
+                        "s" : "0x5af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51c",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x33e20fdd4c0efba38f8347467b10a565c958175ea05c8780596ef08803a0d995",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6afff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7615001",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_49_2401_2401_35000_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/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xae11",
-                    "hash" : "0x0923a72d907abd41d60bcbfa30598e284f1cedb6a496a5fe9d46acd18f51cdd8",
-                    "mixHash" : "0xdc6f52d2a50b9a0535b78c4d690744931be34139c644727796501a53e685b0d1",
-                    "nonce" : "0x5495520de25fff35",
+                    "hash" : "0xf14cee47a041e112936d0bf2fc881f8feb1f73b8c3d9840977c8a112f6ea1be5",
+                    "mixHash" : "0xf9412a59907533c1bc551cb7b7bd84b9638d9d26a2028c7213a22eafeb11e029",
+                    "nonce" : "0x164f804886eaf9cd",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0dc6f52d2a50b9a0535b78c4d690744931be34139c644727796501a53e685b0d1885495520de25fff35f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0f9412a59907533c1bc551cb7b7bd84b9638d9d26a2028c7213a22eafeb11e02988164f804886eaf9cdf90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0923a72d907abd41d60bcbfa30598e284f1cedb6a496a5fe9d46acd18f51cdd8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf14cee47a041e112936d0bf2fc881f8feb1f73b8c3d9840977c8a112f6ea1be5",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_35000_d0g0v0_Frontier" : {
+    "modexp_49_2401_2401_35000_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/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xe150",
-                    "hash" : "0xdc7b3f2ea024fc1574246f20f2ff17d71d522665d4d6ac1786d555315d436c37",
-                    "mixHash" : "0x3540ba3c9338b2647635bfd157bb0f2677634bf09a2021b15d7c3405658db8d5",
-                    "nonce" : "0x73f7f4f4cf39f92d",
+                    "gasUsed" : "0xae11",
+                    "hash" : "0x1ceb587731de64dac645c5da3d1a3c516b742d6f1b0cf6b300e1b1026f09af13",
+                    "mixHash" : "0x20936391b1b12436fadd682ab5c3d8b687eb592c4e5fbd3b9b5255cb37519532",
+                    "nonce" : "0xbf20a3a9c2bc12d5",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0x6ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670",
-                    "stateRoot" : "0x8ff5bec3c50b905dc6929191c1bbd7c8413e2b1ab984ba2aeea2f21a9bc4cdb5",
+                    "receiptTrie" : "0x767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965",
+                    "stateRoot" : "0x1a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ff5bec3c50b905dc6929191c1bbd7c8413e2b1ab984ba2aeea2f21a9bc4cdb5a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa06ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1508203e880a03540ba3c9338b2647635bfd157bb0f2677634bf09a2021b15d7c3405658db8d58873f7f4f4cf39f92df90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a01a5231c9ad58a6f1ac766f6975e5701fd84748044fe2c9ca9cf74cd5ca1fde47a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0767c2fccf012e1cbab067ad17f1784eff86141e737bafdab0609aefcb6b24965b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a020936391b1b12436fadd682ab5c3d8b687eb592c4e5fbd3b9b5255cb3751953288bf20a3a9c2bc12d5f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc7b3f2ea024fc1574246f20f2ff17d71d522665d4d6ac1786d555315d436c37",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1ceb587731de64dac645c5da3d1a3c516b742d6f1b0cf6b300e1b1026f09af13",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6e33e",
+                "balance" : "0x4563918244f6afff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7611cc2",
+                "balance" : "0x0de0b6b3a7615001",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_35000_d0g0v0_Homestead" : {
+    "modexp_49_2401_2401_35000_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/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe150",
-                    "hash" : "0xcf52861c954673ef279a275be50930e69640bb332a441847839cd245f127d72b",
-                    "mixHash" : "0xb857e1befb0ea8215c07c3a4c8b3e7ff399e269b4327738ad42fcbc7e93d9f82",
-                    "nonce" : "0x2281a0ba2f3f7dbb",
+                    "hash" : "0x7bf714547c59dcc478000e6b63379c85f2ff36266aa03e407dcedf7c7f87d4dc",
+                    "mixHash" : "0xacc235ed9ff5ebf3b917398586fe785cbdc4f8ee19002c513910886da45cece7",
+                    "nonce" : "0x415ccbc7f7d8441a",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
                     "receiptTrie" : "0x6ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ff5bec3c50b905dc6929191c1bbd7c8413e2b1ab984ba2aeea2f21a9bc4cdb5a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa06ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1508203e880a0b857e1befb0ea8215c07c3a4c8b3e7ff399e269b4327738ad42fcbc7e93d9f82882281a0ba2f3f7dbbf90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ff5bec3c50b905dc6929191c1bbd7c8413e2b1ab984ba2aeea2f21a9bc4cdb5a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa06ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1508203e880a0acc235ed9ff5ebf3b917398586fe785cbdc4f8ee19002c513910886da45cece788415ccbc7f7d8441af90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf52861c954673ef279a275be50930e69640bb332a441847839cd245f127d72b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7bf714547c59dcc478000e6b63379c85f2ff36266aa03e407dcedf7c7f87d4dc",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_49_2401_2401_35000_d0g0v0_Metropolis" : {
+    "modexp_49_2401_2401_35000_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/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xae11",
-                    "hash" : "0xfa9977d13fb6b4dfa78c672c7377d25d95eb6bd258368bd65decf13b214c10a8",
-                    "mixHash" : "0xac91f7c5b64773d91730b5c30be13674cbf0270408f21cb97d63de29498d3026",
-                    "nonce" : "0x00ae8164a3210987",
+                    "gasUsed" : "0xe150",
+                    "hash" : "0x590a8753a33123d17935529aba23fb0d724004bebb528b16baf7ee9640f719c1",
+                    "mixHash" : "0xed2553f1b5aaf31711b8a605087691e410cd52f5a3834fd94cb173574dc41b56",
+                    "nonce" : "0xbac84dc78deed021",
                     "number" : "0x01",
                     "parentHash" : "0xe11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cf",
-                    "receiptTrie" : "0xb22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3d",
-                    "stateRoot" : "0x873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26e",
+                    "receiptTrie" : "0x6ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670",
+                    "stateRoot" : "0x8ff5bec3c50b905dc6929191c1bbd7c8413e2b1ab984ba2aeea2f21a9bc4cdb5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0873f8ed70bf12e258e690f95835f6620ab78f8d8c3dd980fd679af5cc2b0a26ea0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa0b22b1f4f07f83e77513d9a1df6d9ab6113133dee938883053ea96e140056cc3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ae118203e880a0ac91f7c5b64773d91730b5c30be13674cbf0270408f21cb97d63de29498d30268800ae8164a3210987f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
+                "rlp" : "0xf90326f901f8a0e11b1a140da9bc5489ea6e876d2c12a36e5d9a80791dbebcc9057d8c52be31cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a08ff5bec3c50b905dc6929191c1bbd7c8413e2b1ab984ba2aeea2f21a9bc4cdb5a0bb4ae70e5ec8d76c67667d64b9130d787249179d68a94aadb31ccabfe4cd0d8fa06ace07ce1404b65b3bb8f92917baeb2e65f2f0f1481138d7cda1b0a2f70f4670b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e1508203e880a0ed2553f1b5aaf31711b8a605087691e410cd52f5a3834fd94cb173574dc41b5688bac84dc78deed021f90127f90124010182e15094c305c901078781c232a2a521c2af7980f8385ee980b8c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000231096109610000000000000000000000000000000000000000000000000000001ba09c633f981e5f591470c7042cd4c5db3f09c2ef17595f31fb9ed895438eab7f77a05af87cf78606f33e7f1173f62b6bd2e6f77d30a59aca8b65647bc974d2eeb51cc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a06ea54d757c4321a6731e45c767662fb3de4f012796bcb9713107c879571ea7cda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa9977d13fb6b4dfa78c672c7377d25d95eb6bd258368bd65decf13b214c10a8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x590a8753a33123d17935529aba23fb0d724004bebb528b16baf7ee9640f719c1",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6afff",
+                "balance" : "0x4563918244f6e33e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7615001",
+                "balance" : "0x0de0b6b3a7611cc2",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json
index ba17aa0d0..25d4523e9 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_55190_55190_42965_1000000_d0g0v0_EIP150" : {
+    "modexp_55190_55190_42965_1000000_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/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc2de",
-                    "hash" : "0x07c0ebcc14aafae79d6811e6de910196945032480f538041d47c858ab6dc61a7",
-                    "mixHash" : "0x3a3d1ce8ca4ab64b3beaa2c68f9fc55d549b351e17d32484655104fe8e264146",
-                    "nonce" : "0xd132a790e2cf51fc",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0xdff48eebd64c86be385b711e0ab24206f62f5245fe184c5eca2a5fdb025d6bd0",
+                    "mixHash" : "0xc3825583a199a4ba321e8719dbf1a00528b01a747f024c5f719179fc952fed24",
+                    "nonce" : "0xaf8215bb8e544459",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
-                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a03a3d1ce8ca4ab64b3beaa2c68f9fc55d549b351e17d32484655104fe8e26414688d132a790e2cf51fcf90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a0c3825583a199a4ba321e8719dbf1a00528b01a747f024c5f719179fc952fed2488af8215bb8e544459f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07c0ebcc14aafae79d6811e6de910196945032480f538041d47c858ab6dc61a7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdff48eebd64c86be385b711e0ab24206f62f5245fe184c5eca2a5fdb025d6bd0",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c4cc",
+                "balance" : "0x4563918244f6ceea",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613b34",
+                "balance" : "0x0de0b6b3a7613116",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_55190_55190_42965_1000000_d0g0v0_EIP158" : {
+    "modexp_55190_55190_42965_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0x2b511826778d2823f96cbd462f4cf6d4433f096bcb3cc83b9667a0bf22d17180",
+                    "mixHash" : "0x3ecc68794457a00eeeddca622b97c38edfc0362319b9efafa71bcf816c02c732",
+                    "nonce" : "0xe31be604a6e6d59d",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a03ecc68794457a00eeeddca622b97c38edfc0362319b9efafa71bcf816c02c73288e31be604a6e6d59df90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x0faf98",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5",
+                        "s" : "0x63ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b511826778d2823f96cbd462f4cf6d4433f096bcb3cc83b9667a0bf22d17180",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ceea",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7613116",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_55190_55190_42965_1000000_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/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc2de",
-                    "hash" : "0x93630847a5e7108f81883abc3ae3c7e41c34c1f82868cce7685ac1dcaa90831e",
-                    "mixHash" : "0xd554121bcaf9fa89ea2dc6a5bca1fbdac85540c02783df77cdbae6f5746f35de",
-                    "nonce" : "0x9c99d4557b74f7d8",
+                    "hash" : "0xa705efecc7cb0f15b4afee2d80d25b157a44874ecf0302bdacb752136022fd5c",
+                    "mixHash" : "0x91131776eb040a5c8e53aa98287bf899cf0173ade2a10f1025a0f10135b982f8",
+                    "nonce" : "0xc9dbfda35eade102",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0d554121bcaf9fa89ea2dc6a5bca1fbdac85540c02783df77cdbae6f5746f35de889c99d4557b74f7d8f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a091131776eb040a5c8e53aa98287bf899cf0173ade2a10f1025a0f10135b982f888c9dbfda35eade102f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93630847a5e7108f81883abc3ae3c7e41c34c1f82868cce7685ac1dcaa90831e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa705efecc7cb0f15b4afee2d80d25b157a44874ecf0302bdacb752136022fd5c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_1000000_d0g0v0_Frontier" : {
+    "modexp_55190_55190_42965_1000000_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/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0faf98",
-                    "hash" : "0x999f845c971506cc6fd60b3bce57b80621fd81e10499a7a44616b55e5a07a8d8",
-                    "mixHash" : "0x51268061c59a86b4908f9025c036b3d412c09aaaacca905e37b4d4dd7fa869d5",
-                    "nonce" : "0xc35e71c3e4cfa659",
+                    "gasUsed" : "0xc2de",
+                    "hash" : "0x3298c542aa808c656bb9173d5d52da33899a98c41d4e26367106438ae7016f6d",
+                    "mixHash" : "0x371c7aa79852b358cb1e4b6372e21693fb79baa576e772bcd921f81d62513962",
+                    "nonce" : "0x25238f3f7aa0db53",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x7bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6",
-                    "stateRoot" : "0x2f93b09cc84234e25df600a69c30001a082d998357bf79fd2d8ebcf16327e42f",
+                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
+                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f93b09cc84234e25df600a69c30001a082d998357bf79fd2d8ebcf16327e42fa0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a07bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830faf988203e880a051268061c59a86b4908f9025c036b3d412c09aaaacca905e37b4d4dd7fa869d588c35e71c3e4cfa659f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0371c7aa79852b358cb1e4b6372e21693fb79baa576e772bcd921f81d625139628825238f3f7aa0db53f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x999f845c971506cc6fd60b3bce57b80621fd81e10499a7a44616b55e5a07a8d8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3298c542aa808c656bb9173d5d52da33899a98c41d4e26367106438ae7016f6d",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x456391824505b186",
+                "balance" : "0x4563918244f6c4cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7524e7a",
+                "balance" : "0x0de0b6b3a7613b34",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_1000000_d0g0v0_Homestead" : {
+    "modexp_55190_55190_42965_1000000_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/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0faf98",
-                    "hash" : "0x4616296193274310ffdf684ade9a77a7be292ff6875bfc3acdd6c00e30585807",
-                    "mixHash" : "0xdd5f43c60c6a02263acefe96d763d81d0f9d4d70cb52c4b036ede4fac0f67865",
-                    "nonce" : "0x69ae6af5ae1c7f31",
+                    "hash" : "0x2927ec08277d15eca3c7213c9192b0a166072d54526965b6531447baa7f90b7d",
+                    "mixHash" : "0xd463d93a32a6042cae860431a7b55115e274a7328d507382bf790d3056992eda",
+                    "nonce" : "0x7d06774981d851ff",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x7bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f93b09cc84234e25df600a69c30001a082d998357bf79fd2d8ebcf16327e42fa0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a07bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830faf988203e880a0dd5f43c60c6a02263acefe96d763d81d0f9d4d70cb52c4b036ede4fac0f678658869ae6af5ae1c7f31f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f93b09cc84234e25df600a69c30001a082d998357bf79fd2d8ebcf16327e42fa0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a07bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830faf988203e880a0d463d93a32a6042cae860431a7b55115e274a7328d507382bf790d3056992eda887d06774981d851fff90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4616296193274310ffdf684ade9a77a7be292ff6875bfc3acdd6c00e30585807",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2927ec08277d15eca3c7213c9192b0a166072d54526965b6531447baa7f90b7d",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_1000000_d0g0v0_Metropolis" : {
+    "modexp_55190_55190_42965_1000000_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/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xccfc",
-                    "hash" : "0x2d2e6edb05808bda6f3b70206408b2dba26e608c102646f420c585c160a1a28d",
-                    "mixHash" : "0x463f1725ffa7ce373bb717e519b3ff92f021258755e390026e8266520374c003",
-                    "nonce" : "0xdcc9e9997b0c485f",
+                    "gasUsed" : "0x0faf98",
+                    "hash" : "0x46d9987781af4d8a1015237110abf6a6e0a400b6ec2214e978272b8d20c439eb",
+                    "mixHash" : "0x6ee9219aedfb9ca0e997f2ee7d1a7c895a05607d7a77acf192694d931669d2a4",
+                    "nonce" : "0x6374d4f754ba9ff7",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
-                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "receiptTrie" : "0x7bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6",
+                    "stateRoot" : "0x2f93b09cc84234e25df600a69c30001a082d998357bf79fd2d8ebcf16327e42f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a0463f1725ffa7ce373bb717e519b3ff92f021258755e390026e8266520374c00388dcc9e9997b0c485ff90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
+                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a02f93b09cc84234e25df600a69c30001a082d998357bf79fd2d8ebcf16327e42fa0a3d6b164b1dc6aac7c44c17ea49afbbe3bb708fd2a0eb4a61416b5dccfd690f4a07bf151ba1473e6ac400ab7d93197e4a9104edfd9f53d2b3de9f41d435949f4f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830faf988203e880a06ee9219aedfb9ca0e997f2ee7d1a7c895a05607d7a77acf192694d931669d2a4886374d4f754ba9ff7f90169f901660101830faf9894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba0ce34dbee617a8ddcf773f6efe5e798e74614690646bd85db18b3b84090c67cf5a063ed6baac85ec294262f10abb2d6389419c39f8a31eff245c12175a93c86ea68c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d2e6edb05808bda6f3b70206408b2dba26e608c102646f420c585c160a1a28d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x46d9987781af4d8a1015237110abf6a6e0a400b6ec2214e978272b8d20c439eb",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ceea",
+                "balance" : "0x456391824505b186",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613116",
+                "balance" : "0x0de0b6b3a7524e7a",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json
index ff1043011..bfb5eed68 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_55190_55190_42965_155000_d0g0v0_EIP150" : {
+    "modexp_55190_55190_42965_155000_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/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc2de",
-                    "hash" : "0xbf0b145095979c378e4f62bf3a34efb1e91ff0d7c00365a3270f40a055a3cdd6",
-                    "mixHash" : "0x3d0992934133c9511e24a70c242a72a2d0e13a96ffd4598881249505f5890083",
-                    "nonce" : "0xc0fa99374c972d70",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0x2bfc914cb97de94b50be680e7d68f53ccf9b3f8cfe47fe9efb74340dca97fa02",
+                    "mixHash" : "0x95a76b96653faedd144c371e4857f3ff6899486cb55a0ece8679efa62175bd96",
+                    "nonce" : "0xdcd832ec1fa8d21e",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
-                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a03d0992934133c9511e24a70c242a72a2d0e13a96ffd4598881249505f589008388c0fa99374c972d70f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a095a76b96653faedd144c371e4857f3ff6899486cb55a0ece8679efa62175bd9688dcd832ec1fa8d21ef90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf0b145095979c378e4f62bf3a34efb1e91ff0d7c00365a3270f40a055a3cdd6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2bfc914cb97de94b50be680e7d68f53ccf9b3f8cfe47fe9efb74340dca97fa02",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c4cc",
+                "balance" : "0x4563918244f6ceea",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613b34",
+                "balance" : "0x0de0b6b3a7613116",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_55190_55190_42965_155000_d0g0v0_EIP158" : {
+    "modexp_55190_55190_42965_155000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0x8d2c6988eecc4c158588320272a0e49944315de94d2860e557866621dc1c7126",
+                    "mixHash" : "0x22722261e215fcb1af85d9e3294b4af39b2e500cc2ad8c193f795e8393f2f34b",
+                    "nonce" : "0x28fad390e49716e7",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a022722261e215fcb1af85d9e3294b4af39b2e500cc2ad8c193f795e8393f2f34b8828fad390e49716e7f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0x02cad0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xf5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4d",
+                        "s" : "0x3c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8d2c6988eecc4c158588320272a0e49944315de94d2860e557866621dc1c7126",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ceea",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7613116",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_55190_55190_42965_155000_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/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc2de",
-                    "hash" : "0x4e7a1bcf06b85c834c072ddc9a68cb4f3eecbc76e9b7f6d71d51aa74e90289b9",
-                    "mixHash" : "0x7048de667ec5412de56859b3d4bed9eb865f447f39acd2ab459cce1c9109cdcc",
-                    "nonce" : "0x63ecbad18576dd8b",
+                    "hash" : "0xbf9b3a97313d84fde7ed58920e778cb92bc5ee81b703e56b4a7d44d0aaff5a52",
+                    "mixHash" : "0x7e757189a0be5872655749dcc7d6071bdadfe56fcbd424beb7db3a6ee9efd7cb",
+                    "nonce" : "0xd40aca1eb7e75c3d",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a07048de667ec5412de56859b3d4bed9eb865f447f39acd2ab459cce1c9109cdcc8863ecbad18576dd8bf90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a07e757189a0be5872655749dcc7d6071bdadfe56fcbd424beb7db3a6ee9efd7cb88d40aca1eb7e75c3df90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e7a1bcf06b85c834c072ddc9a68cb4f3eecbc76e9b7f6d71d51aa74e90289b9",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbf9b3a97313d84fde7ed58920e778cb92bc5ee81b703e56b4a7d44d0aaff5a52",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_155000_d0g0v0_Frontier" : {
+    "modexp_55190_55190_42965_155000_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/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02cad0",
-                    "hash" : "0x8bcd323ce832dd96bbf14b9d38695a099e33a2331aed4f6a0cc856fdfb4aac0e",
-                    "mixHash" : "0xad666152accdb8f6d19448a784e83efaf7c56fc8f4d7bb670e17055171d4f812",
-                    "nonce" : "0x47bcd4a31bd55e0e",
+                    "gasUsed" : "0xc2de",
+                    "hash" : "0x4635fcffd90e770f955f9957ffd5ef18a5581ed65c52db7a25c1dd7c08a26d66",
+                    "mixHash" : "0x5f6d4b1936bbddd92021d678e4e588ba8f43d286f19f385b9c5fd1c47c778784",
+                    "nonce" : "0x0ae554b17bfb2229",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xa2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1",
-                    "stateRoot" : "0x36175028aec0caa514141d7d8b55d964dc6dc0e3960bf60d72a64651f8c24c8e",
+                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
+                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a036175028aec0caa514141d7d8b55d964dc6dc0e3960bf60d72a64651f8c24c8ea0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0a2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302cad08203e880a0ad666152accdb8f6d19448a784e83efaf7c56fc8f4d7bb670e17055171d4f8128847bcd4a31bd55e0ef90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a05f6d4b1936bbddd92021d678e4e588ba8f43d286f19f385b9c5fd1c47c778784880ae554b17bfb2229f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bcd323ce832dd96bbf14b9d38695a099e33a2331aed4f6a0cc856fdfb4aac0e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4635fcffd90e770f955f9957ffd5ef18a5581ed65c52db7a25c1dd7c08a26d66",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8ccbe",
+                "balance" : "0x4563918244f6c4cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f3342",
+                "balance" : "0x0de0b6b3a7613b34",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_155000_d0g0v0_Homestead" : {
+    "modexp_55190_55190_42965_155000_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/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02cad0",
-                    "hash" : "0xdc330634d89427c301a2be2981e94edea9e01096393d23bab7e4fee4b4ff0d91",
-                    "mixHash" : "0x40d85be5a9a235b6fc7438a0d90bd9c8a99dc0985f5f4bc7cc077361b4f6fad7",
-                    "nonce" : "0x59f44667d613ed81",
+                    "hash" : "0x3eda11b9d68402aa75401307c52c4de3cdef7fd68ab6e6d8e5e3dbfde791bff2",
+                    "mixHash" : "0x18fb96e3db41c4f9213a04f0f813d5f68e7cd559c259db3ddcd210c1eec90f9b",
+                    "nonce" : "0x00b4340cb7eda54b",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xa2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a036175028aec0caa514141d7d8b55d964dc6dc0e3960bf60d72a64651f8c24c8ea0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0a2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302cad08203e880a040d85be5a9a235b6fc7438a0d90bd9c8a99dc0985f5f4bc7cc077361b4f6fad78859f44667d613ed81f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a036175028aec0caa514141d7d8b55d964dc6dc0e3960bf60d72a64651f8c24c8ea0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0a2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302cad08203e880a018fb96e3db41c4f9213a04f0f813d5f68e7cd559c259db3ddcd210c1eec90f9b8800b4340cb7eda54bf90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc330634d89427c301a2be2981e94edea9e01096393d23bab7e4fee4b4ff0d91",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3eda11b9d68402aa75401307c52c4de3cdef7fd68ab6e6d8e5e3dbfde791bff2",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_155000_d0g0v0_Metropolis" : {
+    "modexp_55190_55190_42965_155000_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/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xccfc",
-                    "hash" : "0xed2ee0da8afb9f4d7018223b9a47a524a93bb6c1229ef4f3771f512121a6b176",
-                    "mixHash" : "0x55d4997da554fa3da90d9c2bbd0bfd6a05135236ae12aac7c8da8d23ddb97bbe",
-                    "nonce" : "0xb0b5135890ff9165",
+                    "gasUsed" : "0x02cad0",
+                    "hash" : "0x24eb94b91c6564141abebe9ddfd18382540518526ac16b0e489969687b770d13",
+                    "mixHash" : "0x02b371c156abaa84acdeb30fcf8dc54ba4f36e4741a8eb56afa1d4e401efd572",
+                    "nonce" : "0x0d27562c1ea0d020",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
-                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "receiptTrie" : "0xa2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1",
+                    "stateRoot" : "0x36175028aec0caa514141d7d8b55d964dc6dc0e3960bf60d72a64651f8c24c8e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90368f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a055d4997da554fa3da90d9c2bbd0bfd6a05135236ae12aac7c8da8d23ddb97bbe88b0b5135890ff9165f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
+                "rlp" : "0xf90369f901f9a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a036175028aec0caa514141d7d8b55d964dc6dc0e3960bf60d72a64651f8c24c8ea0de9531ced7cf043ad1804bc5a3abc8e483631319209605f4ca909287e6fb2d84a0a2f53d57b5077fb17c324dd717b37dd2dbeae91ae6d58fbbef4b96631c9c0dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302cad08203e880a002b371c156abaa84acdeb30fcf8dc54ba4f36e4741a8eb56afa1d4e401efd572880d27562c1ea0d020f90169f9016601018302cad094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca0f5f716e3839aeca09fde2626d741e46d3e35e0153104e71728cb07079480fb4da03c8b55d185cf21a00cacdd647e1c30e6b702db2605c98f44a7f14c8fba648874c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed2ee0da8afb9f4d7018223b9a47a524a93bb6c1229ef4f3771f512121a6b176",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x24eb94b91c6564141abebe9ddfd18382540518526ac16b0e489969687b770d13",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ceea",
+                "balance" : "0x4563918244f8ccbe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613116",
+                "balance" : "0x0de0b6b3a75f3342",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json
index 4f4cf28b4..d8d23c72b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_55190_55190_42965_20500_d0g0v0_EIP150" : {
+    "modexp_55190_55190_42965_20500_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/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbd6c",
-                    "hash" : "0x86aaafc753478ec2fdb68fe62f7bb4baa79c643c6193c250caea0190b311418a",
-                    "mixHash" : "0xb2b27bc2f6aaa2aa2f04d578a8356af70efd035a0ba2ccdc4babdb86ffe00d39",
-                    "nonce" : "0xe5d07781898d65f5",
+                    "hash" : "0xefafefd04dfda7c7cad37f82f838d6aebf9eed2612a8b91424795bfaa25736dc",
+                    "mixHash" : "0x60ec87f536044dcd301019305e5922ffaabbcbfe017f7bb1918cbce8dd3ecbc6",
+                    "nonce" : "0x9268e8d90247950d",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xfd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3eb",
-                    "stateRoot" : "0xa2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280",
+                    "receiptTrie" : "0xb07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79d",
+                    "stateRoot" : "0xb13b467cb9681b868c14099f03757c9146808c234274039b178b736a645e37f9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a0b2b27bc2f6aaa2aa2f04d578a8356af70efd035a0ba2ccdc4babdb86ffe00d3988e5d07781898d65f5f90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b13b467cb9681b868c14099f03757c9146808c234274039b178b736a645e37f9a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0b07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a060ec87f536044dcd301019305e5922ffaabbcbfe017f7bb1918cbce8dd3ecbc6889268e8d90247950df90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86aaafc753478ec2fdb68fe62f7bb4baa79c643c6193c250caea0190b311418a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xefafefd04dfda7c7cad37f82f838d6aebf9eed2612a8b91424795bfaa25736dc",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6bf5a",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_20500_d0g0v0_EIP158" : {
+    "modexp_55190_55190_42965_20500_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/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbd6c",
-                    "hash" : "0xd819619e3f1d34952c8a307359287d82990b9ce7387ef57642505884bd056299",
-                    "mixHash" : "0x68e5cd872fa23a60359d6181b54154e80de06f0f5e9c7293a1d1e3c135f9c660",
-                    "nonce" : "0xe98e180bfd1e9a3f",
+                    "hash" : "0x8004c82437c438335f66815f9d9bd74a7ff1ddffd1aef7a7864ac2254f247a1e",
+                    "mixHash" : "0x5bf1b5107e40c96152f449464ac19a97c103b380bb172621e9d1341b4c7ccb05",
+                    "nonce" : "0x9e3dc12f374278c5",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xfd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3eb",
-                    "stateRoot" : "0xa2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280",
+                    "receiptTrie" : "0xb07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79d",
+                    "stateRoot" : "0xb13b467cb9681b868c14099f03757c9146808c234274039b178b736a645e37f9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a068e5cd872fa23a60359d6181b54154e80de06f0f5e9c7293a1d1e3c135f9c66088e98e180bfd1e9a3ff90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b13b467cb9681b868c14099f03757c9146808c234274039b178b736a645e37f9a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0b07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a05bf1b5107e40c96152f449464ac19a97c103b380bb172621e9d1341b4c7ccb05889e3dc12f374278c5f90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd819619e3f1d34952c8a307359287d82990b9ce7387ef57642505884bd056299",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8004c82437c438335f66815f9d9bd74a7ff1ddffd1aef7a7864ac2254f247a1e",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6bf5a",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_20500_d0g0v0_Frontier" : {
+    "modexp_55190_55190_42965_20500_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/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbd6c",
-                    "hash" : "0x115d8ad31ee9183e04acc4a7c537d8ad269a837771dd03d9ad639409695d455c",
-                    "mixHash" : "0x01d9b0ab2bdde89dc7879aaeee434284d01e76ae42bc669147283808786a64c7",
-                    "nonce" : "0x84cb9688cc0e7198",
+                    "hash" : "0xae884f2db8f6f3fb889d2982ae82fa18ff2038a6437134a2afa327ae3ebf11aa",
+                    "mixHash" : "0xa0686575117e98cafd6a112d6165202e489befed4925c8b299912e2084a4281e",
+                    "nonce" : "0xbd25a980d9289b7e",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xfd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3eb",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a001d9b0ab2bdde89dc7879aaeee434284d01e76ae42bc669147283808786a64c78884cb9688cc0e7198f90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a0a0686575117e98cafd6a112d6165202e489befed4925c8b299912e2084a4281e88bd25a980d9289b7ef90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x115d8ad31ee9183e04acc4a7c537d8ad269a837771dd03d9ad639409695d455c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xae884f2db8f6f3fb889d2982ae82fa18ff2038a6437134a2afa327ae3ebf11aa",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_20500_d0g0v0_Homestead" : {
+    "modexp_55190_55190_42965_20500_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/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbd6c",
-                    "hash" : "0x7eb2e6db712a4979d19dae208fe1fd279ceb6f1e1d1dbdb58fc661380e6fcad5",
-                    "mixHash" : "0x9fb538ff04eaa71ffeff2e0fb761563418d54b1ec5e5b20486b5187ec5ad5743",
-                    "nonce" : "0x43ba5d36db4bf27b",
+                    "hash" : "0xa56f77efbe5f99be14af8dcd14500e93ed65e94c7ba3cc12c3176cb78b9b1315",
+                    "mixHash" : "0x82db00e5ee6546c2d4273a2604fc63111ee2b7688132d0260bbba598b0c74736",
+                    "nonce" : "0x3edfa910e38d4663",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xfd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3eb",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a09fb538ff04eaa71ffeff2e0fb761563418d54b1ec5e5b20486b5187ec5ad57438843ba5d36db4bf27bf90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a082db00e5ee6546c2d4273a2604fc63111ee2b7688132d0260bbba598b0c74736883edfa910e38d4663f90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7eb2e6db712a4979d19dae208fe1fd279ceb6f1e1d1dbdb58fc661380e6fcad5",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa56f77efbe5f99be14af8dcd14500e93ed65e94c7ba3cc12c3176cb78b9b1315",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_20500_d0g0v0_Metropolis" : {
+    "modexp_55190_55190_42965_20500_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/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xbd6c",
-                    "hash" : "0x389ece1a0e05f4f4e35eddbabfcb365ef466441d27bb4d6385a38e754bd044ec",
-                    "mixHash" : "0x946930c8e1788e8d93f4b7297a3a939dc6a5c7418be388235f13f431466eda4f",
-                    "nonce" : "0x9f2a930aa53e0212",
+                    "hash" : "0xc6ecbdde0f37fd8c44afb51c2fa3e44d713ccb9acc9fa71988d8bb5cb623e943",
+                    "mixHash" : "0xe725ce2ee5bd586b7ff98773b5ffb2e7f4f28da3aaa3a53f6dec9734050bf48a",
+                    "nonce" : "0x7075083e15959032",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xb07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79d",
-                    "stateRoot" : "0xb13b467cb9681b868c14099f03757c9146808c234274039b178b736a645e37f9",
+                    "receiptTrie" : "0xfd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3eb",
+                    "stateRoot" : "0xa2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b13b467cb9681b868c14099f03757c9146808c234274039b178b736a645e37f9a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0b07a68dff031d3034ec3bd4033909a9624fc834062f035e09dd9491a4f79d79db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a0946930c8e1788e8d93f4b7297a3a939dc6a5c7418be388235f13f431466eda4f889f2a930aa53e0212f90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a0e725ce2ee5bd586b7ff98773b5ffb2e7f4f28da3aaa3a53f6dec9734050bf48a887075083e15959032f90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x389ece1a0e05f4f4e35eddbabfcb365ef466441d27bb4d6385a38e754bd044ec",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc6ecbdde0f37fd8c44afb51c2fa3e44d713ccb9acc9fa71988d8bb5cb623e943",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6bf5a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a76140a6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_55190_55190_42965_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xbd6c",
+                    "hash" : "0x890a4d05cacbb9be11ad9b03c0406c6e960330f143b6a8a00e338a173dda5bb1",
+                    "mixHash" : "0xbe53bb6b360f07de2f6e3ad00b8104f12fee08b0dd45cad7a8793acf92d73dd5",
+                    "nonce" : "0xbb073af099ab157a",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xfd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3eb",
+                    "stateRoot" : "0xa2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0a2f6ab49490fc4fe43903de1d601cc7ee5c9f682b50964033f551465f358d280a0f24220fff9b0dabf13f5fe953e664eeefe4bd3765c81105abad564ea4ba4fa88a0fd3b456b14d2fdc6f4d6a61d8d63798573b8b9406cd625c441a2f8f53e4bd3ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082bd6c8203e880a0be53bb6b360f07de2f6e3ad00b8104f12fee08b0dd45cad7a8793acf92d73dd588bb073af099ab157af90168f90165010182bd6c94c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba02cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83fa0256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0xbd6c",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2cee944dc8621b7e05517b075caa63ed569bea9c3ab3940d7a02cd508ae0f83f",
+                        "s" : "0x256939cb5f7fd99b148e8278b355c15da7b1e1f606ff9066279ebcb87911b164",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x890a4d05cacbb9be11ad9b03c0406c6e960330f143b6a8a00e338a173dda5bb1",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json
index 64ba9ff41..97f54b573 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_55190_55190_42965_22000_d0g0v0_EIP150" : {
+    "modexp_55190_55190_42965_22000_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/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc2de",
-                    "hash" : "0x928ff796eb7d5fd83e95e889dab3687521d4c7d11fc14ec3b4553449dcf4abeb",
-                    "mixHash" : "0x3771ad5fb8b3141f85c525a11e4f1adabeae9fcbc209bf56c93b4016f401e00f",
-                    "nonce" : "0x8fe72219683aad10",
+                    "gasUsed" : "0xc348",
+                    "hash" : "0x6e3ce55e6f4ee34da51932c4fb3234fd8775ce84a8adb52b914a1813a815638b",
+                    "mixHash" : "0x96775010e166f247013ea0afe80197daf64b035031ec5ed88cf5334680b3fbcc",
+                    "nonce" : "0xf9449f96b9d609f1",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
-                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
+                    "receiptTrie" : "0x3c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450f",
+                    "stateRoot" : "0x70bbff266d3917a24cdbdf57a58916dd83571265a49a33ac998ab811c199ac4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a03771ad5fb8b3141f85c525a11e4f1adabeae9fcbc209bf56c93b4016f401e00f888fe72219683aad10f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a070bbff266d3917a24cdbdf57a58916dd83571265a49a33ac998ab811c199ac4aa0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a03c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a096775010e166f247013ea0afe80197daf64b035031ec5ed88cf5334680b3fbcc88f9449f96b9d609f1f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x928ff796eb7d5fd83e95e889dab3687521d4c7d11fc14ec3b4553449dcf4abeb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6e3ce55e6f4ee34da51932c4fb3234fd8775ce84a8adb52b914a1813a815638b",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c4cc",
+                "balance" : "0x4563918244f6c536",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613b34",
+                "balance" : "0x0de0b6b3a7613aca",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_55190_55190_42965_22000_d0g0v0_EIP158" : {
+    "modexp_55190_55190_42965_22000_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/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xc348",
+                    "hash" : "0x64f06a18fe0c3b519aadd3fbb475645955ac5e2487d3890507151e6df9e6b1db",
+                    "mixHash" : "0x8fe8b31a7f22a0fce954b20394125c814e8674a08f9ec6c4818e88d3a1e7232b",
+                    "nonce" : "0x112fa05cbb582ade",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0x3c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450f",
+                    "stateRoot" : "0x70bbff266d3917a24cdbdf57a58916dd83571265a49a33ac998ab811c199ac4a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a070bbff266d3917a24cdbdf57a58916dd83571265a49a33ac998ab811c199ac4aa0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a03c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a08fe8b31a7f22a0fce954b20394125c814e8674a08f9ec6c4818e88d3a1e7232b88112fa05cbb582adef90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0xc348",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x67ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070e",
+                        "s" : "0x05aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x64f06a18fe0c3b519aadd3fbb475645955ac5e2487d3890507151e6df9e6b1db",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6c536",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7613aca",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_55190_55190_42965_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc2de",
-                    "hash" : "0xb341a3d312ed1ae525d6d2fa64d6f2408153a66e118198487634767dcdc23472",
-                    "mixHash" : "0x841e0e0e0a21b6ec9edfd9bb867826493a0a7cdb61d1af5af0ebff0055826313",
-                    "nonce" : "0x809339dfa4106507",
+                    "hash" : "0xdd5504c08a51357ef78ea55fbe168de9f62fe871af42ad7518d768a25924dadc",
+                    "mixHash" : "0xf00fd009504dce07e4ebd87a2d6ae981cac505a3fb6f4778c9e334889fa45952",
+                    "nonce" : "0x35c9147b5cc448d8",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0841e0e0e0a21b6ec9edfd9bb867826493a0a7cdb61d1af5af0ebff005582631388809339dfa4106507f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0f00fd009504dce07e4ebd87a2d6ae981cac505a3fb6f4778c9e334889fa459528835c9147b5cc448d8f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb341a3d312ed1ae525d6d2fa64d6f2408153a66e118198487634767dcdc23472",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdd5504c08a51357ef78ea55fbe168de9f62fe871af42ad7518d768a25924dadc",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_22000_d0g0v0_Frontier" : {
+    "modexp_55190_55190_42965_22000_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/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc348",
-                    "hash" : "0xd318107221bed8dd71f17d2865b012ef3991168668071a8655deba360b539720",
-                    "mixHash" : "0xbc2daadc81b9083b8dfcce61a4cf1c2e5af62831813ef874a6afcd2dcf676a62",
-                    "nonce" : "0x1135d59ff11d33b7",
+                    "gasUsed" : "0xc2de",
+                    "hash" : "0x449f7fafe17100292c7e74f4bb91bbed42ff23f230c49dd0bdb976e66785bcc3",
+                    "mixHash" : "0x2492773cea70cac430c67c38a7b0a849e1b9e9b6e48a4e803ed9155f71608ddc",
+                    "nonce" : "0x567dc2ebe2051c57",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xfda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367e",
-                    "stateRoot" : "0x28fbbef72ef9c72657fdafd4b78ca3456230fa6d7e080526399806be99c88e4c",
+                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
+                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a028fbbef72ef9c72657fdafd4b78ca3456230fa6d7e080526399806be99c88e4ca0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a0fda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a0bc2daadc81b9083b8dfcce61a4cf1c2e5af62831813ef874a6afcd2dcf676a62881135d59ff11d33b7f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a02492773cea70cac430c67c38a7b0a849e1b9e9b6e48a4e803ed9155f71608ddc88567dc2ebe2051c57f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd318107221bed8dd71f17d2865b012ef3991168668071a8655deba360b539720",
-        "network" : "Frontier",
+        "lastblockhash" : "0x449f7fafe17100292c7e74f4bb91bbed42ff23f230c49dd0bdb976e66785bcc3",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c536",
+                "balance" : "0x4563918244f6c4cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613aca",
+                "balance" : "0x0de0b6b3a7613b34",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_22000_d0g0v0_Homestead" : {
+    "modexp_55190_55190_42965_22000_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/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc348",
-                    "hash" : "0x656ae4357ced9cdc8974e0b0a300c7e0f34d20bc3ae7e8936afe4af9e23b76da",
-                    "mixHash" : "0x1406d1f23e773e076391e3fa53245bf5349bde0e8640f287186742ada0484377",
-                    "nonce" : "0x25a850b2219716a5",
+                    "hash" : "0x30a5039e2458a777908d336903d0483f12a9ba57a5f6597fd2dac49daaf30b80",
+                    "mixHash" : "0x55fc15981303272cbb73bef706b7a11959ccea25550fd02b04d56592f69c878c",
+                    "nonce" : "0xcdab47ff4ab3470b",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0xfda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367e",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a028fbbef72ef9c72657fdafd4b78ca3456230fa6d7e080526399806be99c88e4ca0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a0fda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a01406d1f23e773e076391e3fa53245bf5349bde0e8640f287186742ada04843778825a850b2219716a5f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a028fbbef72ef9c72657fdafd4b78ca3456230fa6d7e080526399806be99c88e4ca0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a0fda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a055fc15981303272cbb73bef706b7a11959ccea25550fd02b04d56592f69c878c88cdab47ff4ab3470bf90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x656ae4357ced9cdc8974e0b0a300c7e0f34d20bc3ae7e8936afe4af9e23b76da",
-        "network" : "Homestead",
+        "lastblockhash" : "0x30a5039e2458a777908d336903d0483f12a9ba57a5f6597fd2dac49daaf30b80",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_22000_d0g0v0_Metropolis" : {
+    "modexp_55190_55190_42965_22000_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/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc348",
-                    "hash" : "0x44cbf1a4b8b8254ca62ae8c7c22dbecc9f6c667f19e2bbb2d749031d295618c6",
-                    "mixHash" : "0xf638231077b8d21c5195ffe40d363bfca3480442a6c98ae069d96418c9391b43",
-                    "nonce" : "0x40a7c929de0f5b39",
+                    "hash" : "0x4752315acfd39b36ee8816db979590463af54daed1498cb4e88949d988f4dfd2",
+                    "mixHash" : "0xd0c4b4a468f6886dfe84e010b24fdf766666a69519305cf081d9e28ea6a1b625",
+                    "nonce" : "0xde75c8c7e869094b",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x3c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450f",
-                    "stateRoot" : "0x70bbff266d3917a24cdbdf57a58916dd83571265a49a33ac998ab811c199ac4a",
+                    "receiptTrie" : "0xfda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367e",
+                    "stateRoot" : "0x28fbbef72ef9c72657fdafd4b78ca3456230fa6d7e080526399806be99c88e4c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a070bbff266d3917a24cdbdf57a58916dd83571265a49a33ac998ab811c199ac4aa0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a03c9dddd80d6e393cbff706a289e2d6ef72843a102b9826c56781c6ea379f450fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a0f638231077b8d21c5195ffe40d363bfca3480442a6c98ae069d96418c9391b438840a7c929de0f5b39f90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a028fbbef72ef9c72657fdafd4b78ca3456230fa6d7e080526399806be99c88e4ca0ec422fb23b688163693e57caa473b00ceeac23d1c01599a5fae39556c6a539b5a0fda6603d7d3e0a7d20404cdccf05e7908ce609148015243a74963e578ee3367eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c3488203e880a0d0c4b4a468f6886dfe84e010b24fdf766666a69519305cf081d9e28ea6a1b62588de75c8c7e869094bf90168f90165010182c34894c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ba067ce0d941fdea590df8def82d81a9985564c108907516387cf033f949276070ea005aea5da64ec3ff39efac1283699dbb8e82a5934cba0839536e1faf44d466d21c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44cbf1a4b8b8254ca62ae8c7c22dbecc9f6c667f19e2bbb2d749031d295618c6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4752315acfd39b36ee8816db979590463af54daed1498cb4e88949d988f4dfd2",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6c536",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json
index cddab541e..9d6280ce3 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_55190_55190_42965_25000_d0g0v0_EIP150" : {
+    "modexp_55190_55190_42965_25000_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/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc2de",
-                    "hash" : "0x7d5117aafaa39b0d4310c647bf3af87af1cb97533297225dd1635e4636944c04",
-                    "mixHash" : "0x074e0cb7bd635bbd28f59e62dad2a54093b94a769cbb36b06db95db49d34e112",
-                    "nonce" : "0x75e0487d6833f8c7",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0x822f5c6674989812babbdfa1fc644f0867a18c89dbf49d66fc3bb2144c91cfeb",
+                    "mixHash" : "0xa302d2a07c5aa324a6aab09373ac124c0a80e19183b6affabd76070e7d70e8b9",
+                    "nonce" : "0x6a68638ace2bbe8f",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
-                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0074e0cb7bd635bbd28f59e62dad2a54093b94a769cbb36b06db95db49d34e1128875e0487d6833f8c7f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a0a302d2a07c5aa324a6aab09373ac124c0a80e19183b6affabd76070e7d70e8b9886a68638ace2bbe8ff90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5117aafaa39b0d4310c647bf3af87af1cb97533297225dd1635e4636944c04",
-        "network" : "EIP150",
+        "lastblockhash" : "0x822f5c6674989812babbdfa1fc644f0867a18c89dbf49d66fc3bb2144c91cfeb",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c4cc",
+                "balance" : "0x4563918244f6ceea",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613b34",
+                "balance" : "0x0de0b6b3a7613116",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_55190_55190_42965_25000_d0g0v0_EIP158" : {
+    "modexp_55190_55190_42965_25000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0x4c47cc1a743f6fc789a339702ff898a5f9021f2e7735a237229f3b411370ec06",
+                    "mixHash" : "0x22be37f3ae2837ed6e688b543879d238917592ba4908f0ab0cf7aa8200533f47",
+                    "nonce" : "0xed985cebadc7625d",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a022be37f3ae2837ed6e688b543879d238917592ba4908f0ab0cf7aa8200533f4788ed985cebadc7625df90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0xcf00",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x6a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9",
+                        "s" : "0x77aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3ca",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4c47cc1a743f6fc789a339702ff898a5f9021f2e7735a237229f3b411370ec06",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ceea",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7613116",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_55190_55190_42965_25000_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/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc2de",
-                    "hash" : "0x4b18a8b8900e9dd24ebc1113f8da29d5f08501575d8542af4ede0297322ee838",
-                    "mixHash" : "0x9a0512bb9df283f435a3c75bc31f8f0edd944c8949e02c67cae75a871b470639",
-                    "nonce" : "0x76eea995a38df965",
+                    "hash" : "0xbec0507932c421b67556687f7935ba38ebad6b6ede78b765af8a6598f66ff4af",
+                    "mixHash" : "0x7cf42ba80ae12e256d19f371ccd15b1b01a3084aea35863ce8ce6caf4e529504",
+                    "nonce" : "0xa8046e84f148c93d",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a09a0512bb9df283f435a3c75bc31f8f0edd944c8949e02c67cae75a871b4706398876eea995a38df965f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a07cf42ba80ae12e256d19f371ccd15b1b01a3084aea35863ce8ce6caf4e52950488a8046e84f148c93df90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b18a8b8900e9dd24ebc1113f8da29d5f08501575d8542af4ede0297322ee838",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbec0507932c421b67556687f7935ba38ebad6b6ede78b765af8a6598f66ff4af",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_25000_d0g0v0_Frontier" : {
+    "modexp_55190_55190_42965_25000_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/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf00",
-                    "hash" : "0x979b1078a911c1511bd1b227a5ad1bb345144f0078c049bce3b1e4959dbe2414",
-                    "mixHash" : "0x501fa84667b8914d4bfd93565cd0a6b45ad52e7a7f39934ff0ce3057a0b067d4",
-                    "nonce" : "0x1e38a483254d73ad",
+                    "gasUsed" : "0xc2de",
+                    "hash" : "0xc3482e77876ef4676509b42141c30b4dd0a5b3bc2ea94671f66b85d325f9e34d",
+                    "mixHash" : "0xea96538f3c4c05f4d5298bf8ed9ee3b4f67aa26292b01a699c9d47112a172b5a",
+                    "nonce" : "0x7a6d9adfca20ab20",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x96f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521",
-                    "stateRoot" : "0x06500b543d8aa203057577b623ae6782752ef7a1782d04c319c55b43dffaed48",
+                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
+                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a006500b543d8aa203057577b623ae6782752ef7a1782d04c319c55b43dffaed48a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a096f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf008203e880a0501fa84667b8914d4bfd93565cd0a6b45ad52e7a7f39934ff0ce3057a0b067d4881e38a483254d73adf90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0ea96538f3c4c05f4d5298bf8ed9ee3b4f67aa26292b01a699c9d47112a172b5a887a6d9adfca20ab20f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x979b1078a911c1511bd1b227a5ad1bb345144f0078c049bce3b1e4959dbe2414",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc3482e77876ef4676509b42141c30b4dd0a5b3bc2ea94671f66b85d325f9e34d",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6d0ee",
+                "balance" : "0x4563918244f6c4cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7612f12",
+                "balance" : "0x0de0b6b3a7613b34",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_25000_d0g0v0_Homestead" : {
+    "modexp_55190_55190_42965_25000_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/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf00",
-                    "hash" : "0x51ec116c6c804aefc6b9406f62b8920f828d5a68c15f26190d97638f8864d119",
-                    "mixHash" : "0xf5165ae5712ad432f00f13ddf05bdbe5e3868441b624d0faf2c4f2a103272831",
-                    "nonce" : "0x4ec0e1ea9c801807",
+                    "hash" : "0xf7006201ed1eb3381cd52af05669c04d584f972bd0009d3594d604b9f8169e6a",
+                    "mixHash" : "0x6026a3e73bd1930a585f0141d94556a0dda8a7200e7e71ae71daeb3508a70268",
+                    "nonce" : "0xeede8026bfe05d9f",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x96f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a006500b543d8aa203057577b623ae6782752ef7a1782d04c319c55b43dffaed48a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a096f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf008203e880a0f5165ae5712ad432f00f13ddf05bdbe5e3868441b624d0faf2c4f2a103272831884ec0e1ea9c801807f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a006500b543d8aa203057577b623ae6782752ef7a1782d04c319c55b43dffaed48a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a096f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf008203e880a06026a3e73bd1930a585f0141d94556a0dda8a7200e7e71ae71daeb3508a7026888eede8026bfe05d9ff90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51ec116c6c804aefc6b9406f62b8920f828d5a68c15f26190d97638f8864d119",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf7006201ed1eb3381cd52af05669c04d584f972bd0009d3594d604b9f8169e6a",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_25000_d0g0v0_Metropolis" : {
+    "modexp_55190_55190_42965_25000_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/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xccfc",
-                    "hash" : "0x0c60498e0e1d93593ee56124c48976782097fd14e865bfa909d1094b76cd785e",
-                    "mixHash" : "0x20b02f13da32b621ef359789f7d6451b735d116df7aee6c839541fbfec676af3",
-                    "nonce" : "0xca5dcf37a94d349d",
+                    "gasUsed" : "0xcf00",
+                    "hash" : "0xb8ab4d162b8e53777edb8520b368e40e7d323338d4b1f08a731e7b4eb7d0de9c",
+                    "mixHash" : "0xc1986bd3d6ba2974261b7a34f3fc39e13f8d1b0368db4ca5d3c01017edb14286",
+                    "nonce" : "0x68adb1565b139bb4",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
-                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "receiptTrie" : "0x96f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521",
+                    "stateRoot" : "0x06500b543d8aa203057577b623ae6782752ef7a1782d04c319c55b43dffaed48",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a020b02f13da32b621ef359789f7d6451b735d116df7aee6c839541fbfec676af388ca5dcf37a94d349df90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a006500b543d8aa203057577b623ae6782752ef7a1782d04c319c55b43dffaed48a0b628e0988752a98c1af676711775f9cb8afba08e623ae86d25ddd546f2fe1f52a096f856f1b3efa9457232e6f3e638522cc4833ae35cabeacd14d334d3a3d64521b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf008203e880a0c1986bd3d6ba2974261b7a34f3fc39e13f8d1b0368db4ca5d3c01017edb142868868adb1565b139bb4f90168f90165010182cf0094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca06a588b7a782002d104ddc5870f1e8532f6381ee61f8915a7b507d606343f8ff9a077aceff7e401ea7f2b090bad51ae507cc9b31b00523e5e94524050ea8d61f3cac0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c60498e0e1d93593ee56124c48976782097fd14e865bfa909d1094b76cd785e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb8ab4d162b8e53777edb8520b368e40e7d323338d4b1f08a731e7b4eb7d0de9c",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ceea",
+                "balance" : "0x4563918244f6d0ee",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613116",
+                "balance" : "0x0de0b6b3a7612f12",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json
index 4e62c2330..c6cf7c1f4 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_55190_55190_42965_35000_d0g0v0_EIP150" : {
+    "modexp_55190_55190_42965_35000_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/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xc2de",
-                    "hash" : "0xb7a4236ddbb5307ff4340b4d3312ce20da21ffc84f6d4083a6c01d5f09aeeaf1",
-                    "mixHash" : "0xcaf97d6e021834672ff594994b83e62030ec0d22d7df1e3ed8f31682e064b41e",
-                    "nonce" : "0x25c92069cbb8eba5",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0xb771170d48c3388ffe254dbe70e0044caff99ffc89df6db707bf46c73f261c69",
+                    "mixHash" : "0x1233d4da75e1a5410dd6f805fe761b112775d517cb04e986080c0d7b38d2155b",
+                    "nonce" : "0x8c3237ca484a2a23",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
-                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0caf97d6e021834672ff594994b83e62030ec0d22d7df1e3ed8f31682e064b41e8825c92069cbb8eba5f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a01233d4da75e1a5410dd6f805fe761b112775d517cb04e986080c0d7b38d2155b888c3237ca484a2a23f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a4236ddbb5307ff4340b4d3312ce20da21ffc84f6d4083a6c01d5f09aeeaf1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb771170d48c3388ffe254dbe70e0044caff99ffc89df6db707bf46c73f261c69",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6c4cc",
+                "balance" : "0x4563918244f6ceea",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613b34",
+                "balance" : "0x0de0b6b3a7613116",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_55190_55190_42965_35000_d0g0v0_EIP158" : {
+    "modexp_55190_55190_42965_35000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xccfc",
+                    "hash" : "0x7a97e79b292d503daa6f35d0310414bbe166a330ee7bea79ce5d89f72e3a2161",
+                    "mixHash" : "0x9ce11eb7d63ca854cd8f9ea5e83272e50e586ffc7ef0519d5093b857f154043d",
+                    "nonce" : "0xb400eeededd0079c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
+                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a09ce11eb7d63ca854cd8f9ea5e83272e50e586ffc7ef0519d5093b857f154043d88b400eeededd0079cf90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
+                        "gasLimit" : "0xf610",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562d",
+                        "s" : "0x7930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7a97e79b292d503daa6f35d0310414bbe166a330ee7bea79ce5d89f72e3a2161",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6ceea",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7613116",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0201ee",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fe12",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_55190_55190_42965_35000_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/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xc2de",
-                    "hash" : "0x5fdf71157c537f03699ab235f6740f57caebfb8121b29ac495a97da576dcc1db",
-                    "mixHash" : "0xce90dd46e352a9a7208963d7b99081d4b881cb731dc9a9f91fb0a3cba228f6de",
-                    "nonce" : "0xd7a3786088c95d85",
+                    "hash" : "0xa169d0ab35faa1c4970afb70136b6b1a8ac86e2cecaff69d52b88462d461e9e5",
+                    "mixHash" : "0xf346b9632ff91e47d876a20c1f207bd0e7009d1f3cdc5f4dcd821d51384e53f6",
+                    "nonce" : "0x9deb577a190d6b14",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0ce90dd46e352a9a7208963d7b99081d4b881cb731dc9a9f91fb0a3cba228f6de88d7a3786088c95d85f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a0f346b9632ff91e47d876a20c1f207bd0e7009d1f3cdc5f4dcd821d51384e53f6889deb577a190d6b14f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fdf71157c537f03699ab235f6740f57caebfb8121b29ac495a97da576dcc1db",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa169d0ab35faa1c4970afb70136b6b1a8ac86e2cecaff69d52b88462d461e9e5",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_35000_d0g0v0_Frontier" : {
+    "modexp_55190_55190_42965_35000_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/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf610",
-                    "hash" : "0xf6257e6f8df70eae92d9c2819d34b527f4859afa023a093f521bf20fa693636d",
-                    "mixHash" : "0xb54dacf07b41c6d53acec043fa734aa203ca54e0f2c3901410dad5102a916cb6",
-                    "nonce" : "0x41ed2e5a8b2f5430",
+                    "gasUsed" : "0xc2de",
+                    "hash" : "0x9b9636d5462930f6e652895c08c15d63be7c18426511e7945e73e3a10e184025",
+                    "mixHash" : "0x74e9a381c15cac611a11eaad6032a2292e82b03395f224aa9f932b93d4a229ee",
+                    "nonce" : "0x5407bb7eee314473",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0x47c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85dde",
-                    "stateRoot" : "0xeda9e528c79ce36370f4f8d9b1e7d63f51ce7286f31110e33983547800873732",
+                    "receiptTrie" : "0x9176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9",
+                    "stateRoot" : "0x292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0eda9e528c79ce36370f4f8d9b1e7d63f51ce7286f31110e33983547800873732a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca047c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85ddeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f6108203e880a0b54dacf07b41c6d53acec043fa734aa203ca54e0f2c3901410dad5102a916cb68841ed2e5a8b2f5430f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0292759b41b5b8a0e8a6210bea86ffe4dc4972d92661e08e2c7fe80c77b05d660a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca09176dc691a5aeec5c8de1a26a2ccca2b296617d5e5a9ea40982ae645d998d3a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082c2de8203e880a074e9a381c15cac611a11eaad6032a2292e82b03395f224aa9f932b93d4a229ee885407bb7eee314473f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6257e6f8df70eae92d9c2819d34b527f4859afa023a093f521bf20fa693636d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9b9636d5462930f6e652895c08c15d63be7c18426511e7945e73e3a10e184025",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f7fe",
+                "balance" : "0x4563918244f6c4cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610802",
+                "balance" : "0x0de0b6b3a7613b34",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x5380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_35000_d0g0v0_Homestead" : {
+    "modexp_55190_55190_42965_35000_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/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf610",
-                    "hash" : "0xea4a63c1d13e0ef81eef64e6b5e904ddacbd00c6fc30a0f0263082e75f83f754",
-                    "mixHash" : "0x27bbf8fd47625960845ad07b0d12d2fcf7131f25e7387e46dd3a8a0ffcaae4bc",
-                    "nonce" : "0xf362ec3e40769db7",
+                    "hash" : "0x7d0ee08c366ef08d5d0070365bd267845d750601ec2e18ef878de2c25e0f36f1",
+                    "mixHash" : "0xdfdaff46f705a4a9f1e609bcde89547c8d9d73c75c492e8998149f7876f3d710",
+                    "nonce" : "0x6dd17d137854e9f4",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
                     "receiptTrie" : "0x47c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85dde",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0eda9e528c79ce36370f4f8d9b1e7d63f51ce7286f31110e33983547800873732a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca047c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85ddeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f6108203e880a027bbf8fd47625960845ad07b0d12d2fcf7131f25e7387e46dd3a8a0ffcaae4bc88f362ec3e40769db7f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0eda9e528c79ce36370f4f8d9b1e7d63f51ce7286f31110e33983547800873732a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca047c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85ddeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f6108203e880a0dfdaff46f705a4a9f1e609bcde89547c8d9d73c75c492e8998149f7876f3d710886dd17d137854e9f4f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea4a63c1d13e0ef81eef64e6b5e904ddacbd00c6fc30a0f0263082e75f83f754",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7d0ee08c366ef08d5d0070365bd267845d750601ec2e18ef878de2c25e0f36f1",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_55190_55190_42965_35000_d0g0v0_Metropolis" : {
+    "modexp_55190_55190_42965_35000_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/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xccfc",
-                    "hash" : "0xab46b063e6a36f1fe82ecb4942c92b5e136303219a24d0ef7daa58d56d801f1e",
-                    "mixHash" : "0x0d4822480b7a5dac160aad8812c021eaa55da89bb5334eb61708c47c91f283b0",
-                    "nonce" : "0x3f1e58af11f59c59",
+                    "gasUsed" : "0xf610",
+                    "hash" : "0x7823477a454d7ec356899b2fdb599317ac397e4a1bcae792b38e29e362646df4",
+                    "mixHash" : "0x88f92084eaa56f3c8f71f802f0decd140e987503802cc8167674d1a0a53181cb",
+                    "nonce" : "0x5d5d4c6e7f5e20a0",
                     "number" : "0x01",
                     "parentHash" : "0xe15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ad",
-                    "receiptTrie" : "0xeef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484",
-                    "stateRoot" : "0xd70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2",
+                    "receiptTrie" : "0x47c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85dde",
+                    "stateRoot" : "0xeda9e528c79ce36370f4f8d9b1e7d63f51ce7286f31110e33983547800873732",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0d70390f94c09c9e7d5f330d99251f4ea6be448985357c13ebfbafccdcaa2edd2a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca0eef592b99c35da4cb9932fdfb92d9a5bd1699572ca851e2cc9d7bd1a6d20f484b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ccfc8203e880a00d4822480b7a5dac160aad8812c021eaa55da89bb5334eb61708c47c91f283b0883f1e58af11f59c59f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
+                "rlp" : "0xf90367f901f8a0e15d0dabb0fbd62154afea8244ae265253ca1788cbe10ecfcfe3674f1e28d8ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0eda9e528c79ce36370f4f8d9b1e7d63f51ce7286f31110e33983547800873732a0f8b625d756860943a115d5055070f66d652501f766121a14ceb102a1326ebc1ca047c97c8c963abcfba46565ba987ea5494e4b1ed15d73e9e900b60e6baaa85ddeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f6108203e880a088f92084eaa56f3c8f71f802f0decd140e987503802cc8167674d1a0a53181cb885d5d4c6e7f5e20a0f90168f90165010182f61094c305c901078781c232a2a521c2af7980f8385ee980b9010430c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff50000000000000000000000001ca02fe7b790eae45270a64e6410f90809688fd11a69a3f555ff1c89f7097fee562da07930e3561538d2a1fee2040aed9493dcda7e8af8d2511d689dc009826a916659c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0cceb78936af05f327963f56162ebef9975e79816efdbde504495c4c342bf7eb3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab46b063e6a36f1fe82ecb4942c92b5e136303219a24d0ef7daa58d56d801f1e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7823477a454d7ec356899b2fdb599317ac397e4a1bcae792b38e29e362646df4",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6ceea",
+                "balance" : "0x4563918244f6f7fe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7613116",
+                "balance" : "0x0de0b6b3a7610802",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json
index 743d0638c..2ffd5bb29 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_9_37111_37111_1000000_d0g0v0_EIP150" : {
+    "modexp_9_37111_37111_1000000_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/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1b0",
-                    "hash" : "0xf23a559385ba32d8cdbc7e47bd4507145d5feee763af303a8c8e9c3a878244af",
-                    "mixHash" : "0xa2d665883cf3c75c17e3065a7fa878f3fef15d8c8b05cab94cccbfc9dcaca8f2",
-                    "nonce" : "0xa150fddd57d984de",
+                    "gasUsed" : "0x0305a5",
+                    "hash" : "0x12ce37d9258b3a4df5393932342bcc4dd2fce9d937c84c922b19882eebbca209",
+                    "mixHash" : "0x03ff129b5ab074daf9714a9a7d38fd4e11ecec97d462bb7faa93daefdf8ebae9",
+                    "nonce" : "0x4964536ee187e3f5",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
-                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
+                    "receiptTrie" : "0xba6ebaf002c228415294b33b74123537e22365468f4140e95f84d09900a77028",
+                    "stateRoot" : "0xf8cf79f23f9eee37ded6c3e8e596e9b17a0cdc618146c63005a8bd173adfa5a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0a2d665883cf3c75c17e3065a7fa878f3fef15d8c8b05cab94cccbfc9dcaca8f288a150fddd57d984def90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f8cf79f23f9eee37ded6c3e8e596e9b17a0cdc618146c63005a8bd173adfa5a8a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0ba6ebaf002c228415294b33b74123537e22365468f4140e95f84d09900a77028b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305a58203e880a003ff129b5ab074daf9714a9a7d38fd4e11ecec97d462bb7faa93daefdf8ebae9884964536ee187e3f5f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf23a559385ba32d8cdbc7e47bd4507145d5feee763af303a8c8e9c3a878244af",
-        "network" : "EIP150",
+        "lastblockhash" : "0x12ce37d9258b3a4df5393932342bcc4dd2fce9d937c84c922b19882eebbca209",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4aa",
+                "balance" : "0x4563918244f9089f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b56",
+                "balance" : "0x0de0b6b3a75ef761",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
+                    "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91"
                 }
             }
         },
@@ -224,10 +231,242 @@
             }
         }
     },
-    "modexp_9_37111_37111_1000000_d0g0v0_EIP158" : {
+    "modexp_9_37111_37111_1000000_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x0305a5",
+                    "hash" : "0x8184105e47fb950537badb7b19da65f6e8abfba15a896843ae4525247f1936fe",
+                    "mixHash" : "0x914e2289af08cc12b36911b1411ff076d76f09eb0bf350c6a81a54963a3ff302",
+                    "nonce" : "0x163ba7fa73854c8a",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xba6ebaf002c228415294b33b74123537e22365468f4140e95f84d09900a77028",
+                    "stateRoot" : "0xf8cf79f23f9eee37ded6c3e8e596e9b17a0cdc618146c63005a8bd173adfa5a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f8cf79f23f9eee37ded6c3e8e596e9b17a0cdc618146c63005a8bd173adfa5a8a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0ba6ebaf002c228415294b33b74123537e22365468f4140e95f84d09900a77028b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305a58203e880a0914e2289af08cc12b36911b1411ff076d76f09eb0bf350c6a81a54963a3ff30288163ba7fa73854c8af90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0fde18",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x79b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cf",
+                        "s" : "0x1e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8184105e47fb950537badb7b19da65f6e8abfba15a896843ae4525247f1936fe",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f9089f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75ef761",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91"
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_9_37111_37111_1000000_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/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +478,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1b0",
-                    "hash" : "0xc3b22bd233f743c402eb654c659ddd10980ffc2f51753984682e2013085b29b3",
-                    "mixHash" : "0x43ed7df2582cda57357aaefd272d84edf315dde7784224d9cc70de544dee2d83",
-                    "nonce" : "0xfa3d639ccf47991a",
+                    "hash" : "0x0ac68cc6a8ee963495dc19a40fff089c876dc42ba1f839d542b3588a89bb475a",
+                    "mixHash" : "0xcb7c5abbd000721357533e25d026bdef9feb9e4206e8bcac47fda478a4f2b24d",
+                    "nonce" : "0xdcffd96a2e1d660f",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
@@ -250,7 +489,7 @@
                     "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a043ed7df2582cda57357aaefd272d84edf315dde7784224d9cc70de544dee2d8388fa3d639ccf47991af90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0cb7c5abbd000721357533e25d026bdef9feb9e4206e8bcac47fda478a4f2b24d88dcffd96a2e1d660ff90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +526,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc3b22bd233f743c402eb654c659ddd10980ffc2f51753984682e2013085b29b3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0ac68cc6a8ee963495dc19a40fff089c876dc42ba1f839d542b3588a89bb475a",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +688,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_1000000_d0g0v0_Frontier" : {
+    "modexp_9_37111_37111_1000000_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/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0fde18",
-                    "hash" : "0x79d440044dc0461ff6391efb3f106b4e8c2680c9b1ac6771e8598fc55ec9ec5c",
-                    "mixHash" : "0x4c519388c69a6639e0faf52da6597a6bdd0a01913f2a97ca246c5ad0e0bce28e",
-                    "nonce" : "0xde6a66a8be0737ca",
+                    "gasUsed" : "0xf1b0",
+                    "hash" : "0xe54c7bf9a143eb164d513c2cd384ed4af5de2fa7e8d0c320ac756063ac4b329a",
+                    "mixHash" : "0xcbb810b874bf65f112c0d2f6b4af610de35f861ea732bcdfabd09a5dde40c5ea",
+                    "nonce" : "0xe6a8e751644d49e1",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xfcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cb",
-                    "stateRoot" : "0x40f01a5b241038755dc472dbf0ef8d0f1f13a5909d3369804af267e98da0d983",
+                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
+                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a040f01a5b241038755dc472dbf0ef8d0f1f13a5909d3369804af267e98da0d983a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0fcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a04c519388c69a6639e0faf52da6597a6bdd0a01913f2a97ca246c5ad0e0bce28e88de6a66a8be0737caf90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0cbb810b874bf65f112c0d2f6b4af610de35f861ea732bcdfabd09a5dde40c5ea88e6a8e751644d49e1f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +751,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79d440044dc0461ff6391efb3f106b4e8c2680c9b1ac6771e8598fc55ec9ec5c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe54c7bf9a143eb164d513c2cd384ed4af5de2fa7e8d0c320ac756063ac4b329a",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +811,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x456391824505e112",
+                "balance" : "0x4563918244f6f4aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7521eee",
+                "balance" : "0x0de0b6b3a7610b56",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +829,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +913,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_1000000_d0g0v0_Homestead" : {
+    "modexp_9_37111_37111_1000000_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/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +928,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0fde18",
-                    "hash" : "0x9934b6dde2624976fd8455135bb7899c267c8e685bc9dbdc6999e0b75c7d2449",
-                    "mixHash" : "0x774171b950d0a2cc20ebda3a70ac08b83f2a5ff8c8741b62cd9b4c9c3ee8f9a5",
-                    "nonce" : "0xb1b40043febd2b9a",
+                    "hash" : "0x4431c95cb11fa0c621e622f56c9d9d4630e7bda84586311a4141b35e43637fe4",
+                    "mixHash" : "0xd434d149d9742463a87075743ff0fce2ca766f8880c817845718b5e9c304d7d9",
+                    "nonce" : "0xfbcbc3d27fdf802e",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0xfcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cb",
@@ -699,7 +939,7 @@
                     "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a040f01a5b241038755dc472dbf0ef8d0f1f13a5909d3369804af267e98da0d983a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0fcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0774171b950d0a2cc20ebda3a70ac08b83f2a5ff8c8741b62cd9b4c9c3ee8f9a588b1b40043febd2b9af90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a040f01a5b241038755dc472dbf0ef8d0f1f13a5909d3369804af267e98da0d983a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0fcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0d434d149d9742463a87075743ff0fce2ca766f8880c817845718b5e9c304d7d988fbcbc3d27fdf802ef90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +976,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9934b6dde2624976fd8455135bb7899c267c8e685bc9dbdc6999e0b75c7d2449",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4431c95cb11fa0c621e622f56c9d9d4630e7bda84586311a4141b35e43637fe4",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1137,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_1000000_d0g0v0_Metropolis" : {
+    "modexp_9_37111_37111_1000000_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/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -911,19 +1151,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0305a5",
-                    "hash" : "0x074c54abe10022159e4cd2b6e3e8483aa12825958472db49984e70fc4b2708c0",
-                    "mixHash" : "0x9ca760a361cd9957039d0295d0ffc68bfeff881dcfb7eac5d9c70ff992b25b77",
-                    "nonce" : "0x5106afb87c30abe3",
+                    "gasUsed" : "0x0fde18",
+                    "hash" : "0x52e904d0420a0a7c78c7e1d96edea8fbd337e83c4a1c1d16437987ef84ff3feb",
+                    "mixHash" : "0xf9d66e5308578be202b728008f96c17a505592e3bf58386b6261d1610935e7dc",
+                    "nonce" : "0x0b122b295fafde7e",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xba6ebaf002c228415294b33b74123537e22365468f4140e95f84d09900a77028",
-                    "stateRoot" : "0xf8cf79f23f9eee37ded6c3e8e596e9b17a0cdc618146c63005a8bd173adfa5a8",
+                    "receiptTrie" : "0xfcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cb",
+                    "stateRoot" : "0x40f01a5b241038755dc472dbf0ef8d0f1f13a5909d3369804af267e98da0d983",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0f8cf79f23f9eee37ded6c3e8e596e9b17a0cdc618146c63005a8bd173adfa5a8a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0ba6ebaf002c228415294b33b74123537e22365468f4140e95f84d09900a77028b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830305a58203e880a09ca760a361cd9957039d0295d0ffc68bfeff881dcfb7eac5d9c70ff992b25b77885106afb87c30abe3f90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a040f01a5b241038755dc472dbf0ef8d0f1f13a5909d3369804af267e98da0d983a0067dfc47238a5c782c08d3609bfa98dee4db0a7716fd6f04397919b04ed04a3da0fcc9448ca1c60ea05a17f92c499f2ac9c5639f3c52cb5840f7498a2b6460c3cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830fde188203e880a0f9d66e5308578be202b728008f96c17a505592e3bf58386b6261d1610935e7dc880b122b295fafde7ef90229f902260101830fde1894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba079b09fa7c14e4b55dc91bb056b2c79cd57d80f3e52c3cacabf21a6a1041fd7cfa01e3e774e4f45ca24554da28dd9cbcf9dcb30d2aa7f8862befed5c8965db30402c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1200,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x074c54abe10022159e4cd2b6e3e8483aa12825958472db49984e70fc4b2708c0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x52e904d0420a0a7c78c7e1d96edea8fbd337e83c4a1c1d16437987ef84ff3feb",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,22 +1259,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f9089f",
+                "balance" : "0x456391824505e112",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75ef761",
+                "balance" : "0x0de0b6b3a7521eee",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -1045,7 +1278,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json
index 31f4716f4..86b989d3a 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_9_37111_37111_155000_d0g0v0_EIP150" : {
+    "modexp_9_37111_37111_155000_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/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1b0",
-                    "hash" : "0x71932375fe07d9f1b41c1552982c53a0f55476680baea4d9707bbf984574b07d",
-                    "mixHash" : "0x69d4046c5d2b37298ad0546b11c928e483abb6b854ebf2293d88a721c7d66d3b",
-                    "nonce" : "0xbeb7f1cee6d4cd3e",
+                    "gasUsed" : "0x02f950",
+                    "hash" : "0x7e1922cc884452939a05cfd3a2435d42d5947f4768ef212c24e0732c6271f813",
+                    "mixHash" : "0xbfebb84efd609cd407f30042e5dbeb92cf86813d5ad2ccd8b5207fdccf8eae54",
+                    "nonce" : "0xb782f64972f18745",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
-                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
+                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
+                    "stateRoot" : "0xbcfd63429221c8fe97fe3701e27dc0a3c34de9d5970f8de06bbf9e54bb58ef82",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a069d4046c5d2b37298ad0546b11c928e483abb6b854ebf2293d88a721c7d66d3b88beb7f1cee6d4cd3ef90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bcfd63429221c8fe97fe3701e27dc0a3c34de9d5970f8de06bbf9e54bb58ef82a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0bfebb84efd609cd407f30042e5dbeb92cf86813d5ad2ccd8b5207fdccf8eae5488b782f64972f18745f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71932375fe07d9f1b41c1552982c53a0f55476680baea4d9707bbf984574b07d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7e1922cc884452939a05cfd3a2435d42d5947f4768ef212c24e0732c6271f813",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4aa",
+                "balance" : "0x4563918244f8fc4a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b56",
+                "balance" : "0x0de0b6b3a75f03b6",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_9_37111_37111_155000_d0g0v0_EIP158" : {
+    "modexp_9_37111_37111_155000_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/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x02f950",
+                    "hash" : "0x0c65ffa15c34592285b084b1f007c0207c524b8cbd75146946bbc1a3476ee54a",
+                    "mixHash" : "0x1c722ae7c2b95ed8946193db90f69921e22f96e82f00cbffa80d81d299215c2a",
+                    "nonce" : "0x8c9b8824073cafdb",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
+                    "stateRoot" : "0xbcfd63429221c8fe97fe3701e27dc0a3c34de9d5970f8de06bbf9e54bb58ef82",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bcfd63429221c8fe97fe3701e27dc0a3c34de9d5970f8de06bbf9e54bb58ef82a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a01c722ae7c2b95ed8946193db90f69921e22f96e82f00cbffa80d81d299215c2a888c9b8824073cafdbf90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x02f950",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabb",
+                        "s" : "0x70c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0c65ffa15c34592285b084b1f007c0207c524b8cbd75146946bbc1a3476ee54a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f8fc4a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a75f03b6",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_9_37111_37111_155000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1b0",
-                    "hash" : "0xc2749727832e710a0c758c51994b91c80599e72ea81952230f89a4544b65501e",
-                    "mixHash" : "0x1f796351aad632b6df6271016a24ced7fcf59f7de5537f44b943326562a3cf01",
-                    "nonce" : "0x18bb223f2f111b00",
+                    "hash" : "0x14e1232e1be69c259a9952892894e82a7c369c28cd2022f242d30b31c9cca32f",
+                    "mixHash" : "0xd9ab1751064362472e3cd6382c8cef007436e578af9104d30b27b9d50c43bccb",
+                    "nonce" : "0xe23e2297bc881d12",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a01f796351aad632b6df6271016a24ced7fcf59f7de5537f44b943326562a3cf018818bb223f2f111b00f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0d9ab1751064362472e3cd6382c8cef007436e578af9104d30b27b9d50c43bccb88e23e2297bc881d12f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2749727832e710a0c758c51994b91c80599e72ea81952230f89a4544b65501e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x14e1232e1be69c259a9952892894e82a7c369c28cd2022f242d30b31c9cca32f",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_155000_d0g0v0_Frontier" : {
+    "modexp_9_37111_37111_155000_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/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x02f950",
-                    "hash" : "0x8ea828f93f4d7408048ca5c48b0e6285a18098acefa565a691b337ce953b2e50",
-                    "mixHash" : "0x3f1719444df1c7f10b7da5abbe13686a6e9ecb1c39968f7ef74d30e1b7330a68",
-                    "nonce" : "0xe38f254d9aa42458",
+                    "gasUsed" : "0xf1b0",
+                    "hash" : "0x7a2d54f01d357f99d276f03bcedd43356be083e34cb58083d7322ede2783bcc1",
+                    "mixHash" : "0x0bfcbdc89a5a8d04ef438b23f7e309a5dfd0198144b65eac8ca3872fd8b2b548",
+                    "nonce" : "0xd87578bf6874ed04",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394b",
-                    "stateRoot" : "0x3c7db1fc324cee75820753dcc19a4580c38f600d880a07f7c4923bea3b749459",
+                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
+                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c7db1fc324cee75820753dcc19a4580c38f600d880a07f7c4923bea3b749459a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a0445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a03f1719444df1c7f10b7da5abbe13686a6e9ecb1c39968f7ef74d30e1b7330a6888e38f254d9aa42458f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a00bfcbdc89a5a8d04ef438b23f7e309a5dfd0198144b65eac8ca3872fd8b2b54888d87578bf6874ed04f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ea828f93f4d7408048ca5c48b0e6285a18098acefa565a691b337ce953b2e50",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7a2d54f01d357f99d276f03bcedd43356be083e34cb58083d7322ede2783bcc1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f8fc4a",
+                "balance" : "0x4563918244f6f4aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a75f03b6",
+                "balance" : "0x0de0b6b3a7610b56",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_155000_d0g0v0_Homestead" : {
+    "modexp_9_37111_37111_155000_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/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x9ca7b3bdfede8ab2f8f218edf231a007188ed2a41f393059c299ed1624d7c5b2",
-                    "mixHash" : "0xcb2e322eea89e2956b94b8fa85258743f9460ad173cd49bc6b7fa06126667032",
-                    "nonce" : "0x287bc8f6fef1d4d2",
+                    "hash" : "0xe1b20c7f2613ffe1d8afdd7d07c274760d87eea51c9ca414a4d654f69002b45e",
+                    "mixHash" : "0x9990d564dafbd342a816c5c44d4a16268bc77e5f20f191b175b6fdf5fb707725",
+                    "nonce" : "0x032fc3345a0c6974",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394b",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c7db1fc324cee75820753dcc19a4580c38f600d880a07f7c4923bea3b749459a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a0445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0cb2e322eea89e2956b94b8fa85258743f9460ad173cd49bc6b7fa0612666703288287bc8f6fef1d4d2f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c7db1fc324cee75820753dcc19a4580c38f600d880a07f7c4923bea3b749459a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a0445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a09990d564dafbd342a816c5c44d4a16268bc77e5f20f191b175b6fdf5fb70772588032fc3345a0c6974f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ca7b3bdfede8ab2f8f218edf231a007188ed2a41f393059c299ed1624d7c5b2",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe1b20c7f2613ffe1d8afdd7d07c274760d87eea51c9ca414a4d654f69002b45e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_155000_d0g0v0_Metropolis" : {
+    "modexp_9_37111_37111_155000_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/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x02f950",
-                    "hash" : "0x073622ce2e9ea417bb5e7aff4d4486f95c7ad835d6572dab5987cc51eace97b7",
-                    "mixHash" : "0xa75401301304cb7d6ae72dab2519337a519be863ace65943d13383c592871091",
-                    "nonce" : "0x512c2b1a439cd792",
+                    "hash" : "0x06832ebfef037da55c93bccb7ef96b687c5c9b1246ecd03596198507796501b9",
+                    "mixHash" : "0x026f621e472bb68a8f11eba5b458205b3610633105217e31c10289b09c8875b7",
+                    "nonce" : "0x07e5d3ba361d9e9a",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x39569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1",
-                    "stateRoot" : "0xbcfd63429221c8fe97fe3701e27dc0a3c34de9d5970f8de06bbf9e54bb58ef82",
+                    "receiptTrie" : "0x445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394b",
+                    "stateRoot" : "0x3c7db1fc324cee75820753dcc19a4580c38f600d880a07f7c4923bea3b749459",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0bcfd63429221c8fe97fe3701e27dc0a3c34de9d5970f8de06bbf9e54bb58ef82a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a039569878ca1eff6cef7cfe543ac1f7efc667632562e408f9d334589a41ba3ce1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0a75401301304cb7d6ae72dab2519337a519be863ace65943d13383c59287109188512c2b1a439cd792f90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a03c7db1fc324cee75820753dcc19a4580c38f600d880a07f7c4923bea3b749459a0774e70b2db640e4a3c92a17e5f12e46ebf51221119f3c6a9e3b0e7f83f4f5e48a0445873f2a4d3d852a6b98d3aec4dfaa7323785184737d8555d124b9111b8394bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008302f9508203e880a0026f621e472bb68a8f11eba5b458205b3610633105217e31c10289b09c8875b78807e5d3ba361d9e9af90229f9022601018302f95094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0617dba4ba4991d7f3c63c0c9b2d38dd3a94add00f31492d56d12a2aa4f60eabba070c7205c43c3d823bce6d13917b191ee110b38f11103cde669c6ae8ca240bcd6c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x073622ce2e9ea417bb5e7aff4d4486f95c7ad835d6572dab5987cc51eace97b7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x06832ebfef037da55c93bccb7ef96b687c5c9b1246ecd03596198507796501b9",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f8fc4a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json
index 4d02b7fc0..38d617e61 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_9_37111_37111_20500_d0g0v0_EIP150" : {
+    "modexp_9_37111_37111_20500_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/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x7832a8904f017ee1f767c25c3aefc575f597e0de84daf7c7888b386018d7bea5",
-                    "mixHash" : "0xb3bb7dc5b4cd854e65b2881295d4d347f5b54400d8386b41797826b146614bc3",
-                    "nonce" : "0xd956a27dc4acc317",
+                    "hash" : "0xa726d2aec1e7b93aae2663e76126a8c13b0800d393eae8e363e63d6602b93f7a",
+                    "mixHash" : "0x924e10377126906bd5d54950a63a6d02c995d2f7151dd42a71939063b0e8ee71",
+                    "nonce" : "0x961b5f1085ff95cd",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xe0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5",
-                    "stateRoot" : "0x4b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70",
+                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
+                    "stateRoot" : "0xc58df8264bb7e11494f99a775a042eaae1c4f03af5a742bb840164622ee1f642",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0b3bb7dc5b4cd854e65b2881295d4d347f5b54400d8386b41797826b146614bc388d956a27dc4acc317f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c58df8264bb7e11494f99a775a042eaae1c4f03af5a742bb840164622ee1f642a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0924e10377126906bd5d54950a63a6d02c995d2f7151dd42a71939063b0e8ee7188961b5f1085ff95cdf90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7832a8904f017ee1f767c25c3aefc575f597e0de84daf7c7888b386018d7bea5",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa726d2aec1e7b93aae2663e76126a8c13b0800d393eae8e363e63d6602b93f7a",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6eee6",
                 "code" : "",
@@ -223,10 +230,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_20500_d0g0v0_EIP158" : {
+    "modexp_9_37111_37111_20500_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/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,18 +245,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x93825a7d76a200d57e023807f48ecc732c0571929622f416b70308969a2824ee",
-                    "mixHash" : "0x440f003c64702b8d57e3709b9d696d0e26e557f6b54cfb6e3f9d5dbda575d8b2",
-                    "nonce" : "0xe011930a44fa84ea",
+                    "hash" : "0x009a4508c01f466fc3712e99a7d328502d411e3e666e0ebbeface955764a66f9",
+                    "mixHash" : "0x9957c55f5d4e7c7a3bdd7758d00c12fd072e0e1b11bc258d6e82b8e81d236bba",
+                    "nonce" : "0x8c3717b3da2cf849",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xe0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5",
-                    "stateRoot" : "0x4b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70",
+                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
+                    "stateRoot" : "0xc58df8264bb7e11494f99a775a042eaae1c4f03af5a742bb840164622ee1f642",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0440f003c64702b8d57e3709b9d696d0e26e557f6b54cfb6e3f9d5dbda575d8b288e011930a44fa84eaf90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c58df8264bb7e11494f99a775a042eaae1c4f03af5a742bb840164622ee1f642a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a09957c55f5d4e7c7a3bdd7758d00c12fd072e0e1b11bc258d6e82b8e81d236bba888c3717b3da2cf849f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -286,8 +293,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93825a7d76a200d57e023807f48ecc732c0571929622f416b70308969a2824ee",
-        "network" : "EIP158",
+        "lastblockhash" : "0x009a4508c01f466fc3712e99a7d328502d411e3e666e0ebbeface955764a66f9",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -345,6 +352,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6eee6",
                 "code" : "",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_20500_d0g0v0_Frontier" : {
+    "modexp_9_37111_37111_20500_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/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x5da6b70816b087529e2c13162026806e726d27251f9495ee03f1e061aa354f35",
-                    "mixHash" : "0xed0e375803db07449b01d4fd603fc65ae70188e7035fba2c9dc4e9e1f52c4cf9",
-                    "nonce" : "0x9888db9460b908d2",
+                    "hash" : "0xb56cf812b4d60ceadf7a6564bc281751bf801308f5adb0036bae231863718876",
+                    "mixHash" : "0xde8be14f5f7cb1c54d95cefb6aaa9af90af8a5e187325f566a81f524dc709f75",
+                    "nonce" : "0x090a90ca65ae6af3",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0xe0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5",
@@ -473,7 +487,7 @@
                     "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0ed0e375803db07449b01d4fd603fc65ae70188e7035fba2c9dc4e9e1f52c4cf9889888db9460b908d2f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0de8be14f5f7cb1c54d95cefb6aaa9af90af8a5e187325f566a81f524dc709f7588090a90ca65ae6af3f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -510,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5da6b70816b087529e2c13162026806e726d27251f9495ee03f1e061aa354f35",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb56cf812b4d60ceadf7a6564bc281751bf801308f5adb0036bae231863718876",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -671,10 +685,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_20500_d0g0v0_Homestead" : {
+    "modexp_9_37111_37111_20500_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/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -686,9 +700,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0x4ba7c530799eb9ac1e1f4049b50c76274fdb11a636a27c5d83ad7ef890cb66e2",
-                    "mixHash" : "0x3fa583f1091b0a3c05f32e1c7ccd177df1bda23611ded615025e8a76f6614ddc",
-                    "nonce" : "0xcdf2c756679da61b",
+                    "hash" : "0x19c24febc02d83ed27621b262b7fcfba828ebb9005a6c5eed0b7da08c5758d54",
+                    "mixHash" : "0x9e7aaadc288c8069bae8580908f29654a2d143bb21651c7e87a9151b99732640",
+                    "nonce" : "0x3ddc6eb2da2647b4",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0xe0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5",
@@ -697,7 +711,7 @@
                     "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a03fa583f1091b0a3c05f32e1c7ccd177df1bda23611ded615025e8a76f6614ddc88cdf2c756679da61bf90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a09e7aaadc288c8069bae8580908f29654a2d143bb21651c7e87a9151b99732640883ddc6eb2da2647b4f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -734,8 +748,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ba7c530799eb9ac1e1f4049b50c76274fdb11a636a27c5d83ad7ef890cb66e2",
-        "network" : "Homestead",
+        "lastblockhash" : "0x19c24febc02d83ed27621b262b7fcfba828ebb9005a6c5eed0b7da08c5758d54",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -895,10 +909,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_20500_d0g0v0_Metropolis" : {
+    "modexp_9_37111_37111_20500_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/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -910,18 +924,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xebec",
-                    "hash" : "0xf8f7ac82c0a8519bb68cb20b0f741b2dff30cd41645c6c70440017ff8acf8003",
-                    "mixHash" : "0xeba3e3b1be9c4d651b81b567ac2df1d7d5e30bc056b8e1181d6d0603f798b840",
-                    "nonce" : "0xfc755ce229a1fb45",
+                    "hash" : "0x36a959e8fa9fb7874ceee0c97f729786918d68e0ad0e9c4953c613bd0220bc6b",
+                    "mixHash" : "0x8eff652713eb6174e678d36f8c0ade3645e05ceb3bd427e805a46e2eeceae0ad",
+                    "nonce" : "0x815f0ea486169ac5",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xc9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2",
-                    "stateRoot" : "0xc58df8264bb7e11494f99a775a042eaae1c4f03af5a742bb840164622ee1f642",
+                    "receiptTrie" : "0xe0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5",
+                    "stateRoot" : "0x4b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0c58df8264bb7e11494f99a775a042eaae1c4f03af5a742bb840164622ee1f642a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0c9ef6d404b7f67fb59d5251693ed03c9b9cc1becdc2ec61a42557d74461466b2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a0eba3e3b1be9c4d651b81b567ac2df1d7d5e30bc056b8e1181d6d0603f798b84088fc755ce229a1fb45f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a08eff652713eb6174e678d36f8c0ade3645e05ceb3bd427e805a46e2eeceae0ad88815f0ea486169ac5f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -958,8 +972,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8f7ac82c0a8519bb68cb20b0f741b2dff30cd41645c6c70440017ff8acf8003",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x36a959e8fa9fb7874ceee0c97f729786918d68e0ad0e9c4953c613bd0220bc6b",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1017,8 +1031,225 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6eee6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761111a",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
                 "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_9_37111_37111_20500_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xebec",
+                    "hash" : "0x074f8b03201d9e34d23a7b4f3e7bacadde21589ae661af918a3821d0ab4176a8",
+                    "mixHash" : "0x1019edee0241f25a6a73a5bf18f102626f3179c23b4c0fa9204e4b7f2a68a914",
+                    "nonce" : "0xb47216a1acc645a3",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xe0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5",
+                    "stateRoot" : "0x4b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04b5514f756d430dc1eab40452949b1f16b810e642bba77e829447d7100f80b70a06dadf970c6b09cccd0b1f2c91b29931b0c7b8e9128f0974586d538b36a052a38a0e0cbdb85d5f846e09e659c03ef747a175acb979138d7968a78056b80b440dfd5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ebec8203e880a01019edee0241f25a6a73a5bf18f102626f3179c23b4c0fa9204e4b7f2a68a91488b47216a1acc645a3f90228f90225010182ebec94c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ca0da2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168a04a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xebec",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xda2988db6b8672c1c1f2d5d4efc8df71d68efbe0ad08bb853c8e62732cdad168",
+                        "s" : "0x4a3b2f195559ca9586ac043bbde913f5f8b3dd4ac46eb32cda40bda0e277625e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x074f8b03201d9e34d23a7b4f3e7bacadde21589ae661af918a3821d0ab4176a8",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json
index c545f0011..ef3eace73 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_9_37111_37111_22000_d0g0v0_EIP150" : {
+    "modexp_9_37111_37111_22000_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/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1b0",
-                    "hash" : "0x42260459b97009a9945810a7fed578edf82aabebd06f98fb8fd4f5b9e852f817",
-                    "mixHash" : "0x21a7d33f02f00eac77d2f7172c7ac4c4944c6a98c5486bef6872eb5cfba40305",
-                    "nonce" : "0xffb0b4359f470c45",
+                    "gasUsed" : "0xf1c8",
+                    "hash" : "0x5770d29d57936409be20ac1258c5cead5953a590a32346cf4335aa34bd455959",
+                    "mixHash" : "0x25fd375a786ab92fb4f5c8fac52de348958514abe9d23f5fb567cca260257088",
+                    "nonce" : "0x0d2191504eedf9ca",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
-                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
+                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
+                    "stateRoot" : "0x723f1756107a3db20fb3065fe261a46391e81dfed4e3991e75535e013b6cb02d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a021a7d33f02f00eac77d2f7172c7ac4c4944c6a98c5486bef6872eb5cfba4030588ffb0b4359f470c45f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0723f1756107a3db20fb3065fe261a46391e81dfed4e3991e75535e013b6cb02da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a025fd375a786ab92fb4f5c8fac52de348958514abe9d23f5fb567cca260257088880d2191504eedf9caf90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42260459b97009a9945810a7fed578edf82aabebd06f98fb8fd4f5b9e852f817",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5770d29d57936409be20ac1258c5cead5953a590a32346cf4335aa34bd455959",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4aa",
+                "balance" : "0x4563918244f6f4c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b56",
+                "balance" : "0x0de0b6b3a7610b3e",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_9_37111_37111_22000_d0g0v0_EIP158" : {
+    "modexp_9_37111_37111_22000_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/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xf1c8",
+                    "hash" : "0xe8754f7cd235667ccd53345ddde9d324dcee74881b526f099717c704772cc5b8",
+                    "mixHash" : "0xbc61bf2f60f1894ebdf54abed3a497c1a99dc91e248be4151d1ca90b987d1f61",
+                    "nonce" : "0xb4cb602345aa7458",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
+                    "stateRoot" : "0x723f1756107a3db20fb3065fe261a46391e81dfed4e3991e75535e013b6cb02d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0723f1756107a3db20fb3065fe261a46391e81dfed4e3991e75535e013b6cb02da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a0bc61bf2f60f1894ebdf54abed3a497c1a99dc91e248be4151d1ca90b987d1f6188b4cb602345aa7458f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xf1c8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x5cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229",
+                        "s" : "0x5a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7b",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe8754f7cd235667ccd53345ddde9d324dcee74881b526f099717c704772cc5b8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f6f4c2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a7610b3e",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_9_37111_37111_22000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1b0",
-                    "hash" : "0xde7231a167c9b2c4d4adeb7adc358859a56f1806aa9278ffa45b3c4238a67056",
-                    "mixHash" : "0xf71a5c4078047da62d8bd240d75d6762f2a2dae805a185659d069b7d9f82af6d",
-                    "nonce" : "0x5fdc186df29d8245",
+                    "hash" : "0x5a117bf1d20fdc8b3b7b3656555c98fafc008c7573eb2a22ed11a4fab2306426",
+                    "mixHash" : "0x4e34857e3e2c049886db6835e2d706f543bb001f9376888a0befab1053886a52",
+                    "nonce" : "0xf79e080ded460f2b",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0f71a5c4078047da62d8bd240d75d6762f2a2dae805a185659d069b7d9f82af6d885fdc186df29d8245f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a04e34857e3e2c049886db6835e2d706f543bb001f9376888a0befab1053886a5288f79e080ded460f2bf90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde7231a167c9b2c4d4adeb7adc358859a56f1806aa9278ffa45b3c4238a67056",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5a117bf1d20fdc8b3b7b3656555c98fafc008c7573eb2a22ed11a4fab2306426",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_22000_d0g0v0_Frontier" : {
+    "modexp_9_37111_37111_22000_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/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1c8",
-                    "hash" : "0xef78d8500f9f1859d117c540d6e75ef90b127e19f932ad59d70b88ed459c3de9",
-                    "mixHash" : "0x7fbee65e1d422ee01fc3fb4e1549e4e015707085f06b3773a17fec4fe846b2e6",
-                    "nonce" : "0x2573221277452a2e",
+                    "gasUsed" : "0xf1b0",
+                    "hash" : "0xff0027bca1e53af8d02682971d16d88016e78987f0ff9da9287e71cd84a37ae5",
+                    "mixHash" : "0xdd4278ee7e77829f6df2e7508a0bc987a0a582fa69f8d8bc967b9df66fc38ab8",
+                    "nonce" : "0x099555407aae8843",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x0e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131",
-                    "stateRoot" : "0x4fa145cfeb1cb7fb03b5f9eba613b7e90a7b00e59b41d20fc47f83288dec375d",
+                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
+                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04fa145cfeb1cb7fb03b5f9eba613b7e90a7b00e59b41d20fc47f83288dec375da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a00e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a07fbee65e1d422ee01fc3fb4e1549e4e015707085f06b3773a17fec4fe846b2e6882573221277452a2ef90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0dd4278ee7e77829f6df2e7508a0bc987a0a582fa69f8d8bc967b9df66fc38ab888099555407aae8843f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef78d8500f9f1859d117c540d6e75ef90b127e19f932ad59d70b88ed459c3de9",
-        "network" : "Frontier",
+        "lastblockhash" : "0xff0027bca1e53af8d02682971d16d88016e78987f0ff9da9287e71cd84a37ae5",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4c2",
+                "balance" : "0x4563918244f6f4aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b3e",
+                "balance" : "0x0de0b6b3a7610b56",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_22000_d0g0v0_Homestead" : {
+    "modexp_9_37111_37111_22000_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/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0x5df198f1c1a5c5f5ce69e2ff6dc53e16604579347e167747c87e7425e4f58a3c",
-                    "mixHash" : "0x63c103cf3ef3a8c64f3b661c9f1e1d0e158ec5d50b59eef3c873bb85b1aa412f",
-                    "nonce" : "0xcfc55d51aca9e264",
+                    "hash" : "0xbafc151f4acb2a299ae2f40e177183439779d84a7d882da523aa49ad085de3fb",
+                    "mixHash" : "0x61f8aa43158033974be625f1823312eb10eccd91806399dbb59fbb371f7d88af",
+                    "nonce" : "0x762a6de93f8b6c6d",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x0e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04fa145cfeb1cb7fb03b5f9eba613b7e90a7b00e59b41d20fc47f83288dec375da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a00e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a063c103cf3ef3a8c64f3b661c9f1e1d0e158ec5d50b59eef3c873bb85b1aa412f88cfc55d51aca9e264f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04fa145cfeb1cb7fb03b5f9eba613b7e90a7b00e59b41d20fc47f83288dec375da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a00e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a061f8aa43158033974be625f1823312eb10eccd91806399dbb59fbb371f7d88af88762a6de93f8b6c6df90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5df198f1c1a5c5f5ce69e2ff6dc53e16604579347e167747c87e7425e4f58a3c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbafc151f4acb2a299ae2f40e177183439779d84a7d882da523aa49ad085de3fb",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_22000_d0g0v0_Metropolis" : {
+    "modexp_9_37111_37111_22000_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/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1c8",
-                    "hash" : "0xc0d0852c398725bd936f03e58ff43caeda64ec1dc681c1fdf9109e3469129462",
-                    "mixHash" : "0x89cbe8cc914eda55fcac4437dbcdf20ccc8aa78d1801211174f7d482b96988de",
-                    "nonce" : "0xc81f9c93257c7eb9",
+                    "hash" : "0x8245fa7dc31e11998e16a395a67deb8e56f09697c0d7f0db9e7f6a3ced6014d5",
+                    "mixHash" : "0x22f19093d77d0d29b40dec37c16050b8e9edd5675fd287ed05c4f2d114f8e563",
+                    "nonce" : "0xd50eeec1f195d56e",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601ed",
-                    "stateRoot" : "0x723f1756107a3db20fb3065fe261a46391e81dfed4e3991e75535e013b6cb02d",
+                    "receiptTrie" : "0x0e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131",
+                    "stateRoot" : "0x4fa145cfeb1cb7fb03b5f9eba613b7e90a7b00e59b41d20fc47f83288dec375d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0723f1756107a3db20fb3065fe261a46391e81dfed4e3991e75535e013b6cb02da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a0026e61688a82184479c8661d460f49d0e46108e0f6da511e461f4ea6183601edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a089cbe8cc914eda55fcac4437dbcdf20ccc8aa78d1801211174f7d482b96988de88c81f9c93257c7eb9f90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a04fa145cfeb1cb7fb03b5f9eba613b7e90a7b00e59b41d20fc47f83288dec375da0a7a9f62a934878fb43cdb1d607723e6add55e7ab588603c1cb6f66134962fe60a00e84f051ebcefa1914c32c93b3145be7fa2e0c06c95dde3ed651d1fc667c5131b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1c88203e880a022f19093d77d0d29b40dec37c16050b8e9edd5675fd287ed05c4f2d114f8e56388d50eeec1f195d56ef90228f90225010182f1c894c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba05cf5357e44070982f827d438707464720158d5e5ecb64f3be3250818506fd229a05a90e38afae620ce3e8a34073bdc6fac99b6eec4cc9e7a0498919f4c0d3c1a7bc0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0d0852c398725bd936f03e58ff43caeda64ec1dc681c1fdf9109e3469129462",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8245fa7dc31e11998e16a395a67deb8e56f09697c0d7f0db9e7f6a3ced6014d5",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f6f4c2",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json
index 0c6aa178b..c78a81678 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_9_37111_37111_35000_d0g0v0_EIP150" : {
+    "modexp_9_37111_37111_35000_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/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1b0",
-                    "hash" : "0xb9d089714c6f16a4563ab3e9434544fadb3411b59a1ed5f38d1dc86300ddb12c",
-                    "mixHash" : "0x21bbc9bea077ef4731f2bedc8d5d345a7c69d7b1490c7c2b610c678bb9f7abdc",
-                    "nonce" : "0x7695fcedae964de7",
+                    "gasUsed" : "0x012490",
+                    "hash" : "0xd2e20d9381b1404fa2db543bc693772636a96eb260dc81aafb120f13b0a294d8",
+                    "mixHash" : "0x0971a518d8ffb880d68ba4f34ee93c06385ebf7cf61eab5dd310bdfb609f0a3c",
+                    "nonce" : "0x20bceb490437b4c0",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
-                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
+                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
+                    "stateRoot" : "0x568c1eb3f2405df6f62cc75af3ccfae6120a8dd9fcdae0bb1f19fc8ff1e7c32b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a021bbc9bea077ef4731f2bedc8d5d345a7c69d7b1490c7c2b610c678bb9f7abdc887695fcedae964de7f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0568c1eb3f2405df6f62cc75af3ccfae6120a8dd9fcdae0bb1f19fc8ff1e7c32ba0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a00971a518d8ffb880d68ba4f34ee93c06385ebf7cf61eab5dd310bdfb609f0a3c8820bceb490437b4c0f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9d089714c6f16a4563ab3e9434544fadb3411b59a1ed5f38d1dc86300ddb12c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd2e20d9381b1404fa2db543bc693772636a96eb260dc81aafb120f13b0a294d8",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4aa",
+                "balance" : "0x4563918244f7278a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b56",
+                "balance" : "0x0de0b6b3a760d876",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_9_37111_37111_35000_d0g0v0_EIP158" : {
+    "modexp_9_37111_37111_35000_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/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x012490",
+                    "hash" : "0x23acae660f75a8ee2893843c88deda2df2c96425cdee967c626077de7d49b46a",
+                    "mixHash" : "0x2b29d5d1498f928b76a2e72db82a6ec5de3ef02cd89ae72e363b9303c146908b",
+                    "nonce" : "0xd8595c3c075a25c8",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
+                    "stateRoot" : "0x568c1eb3f2405df6f62cc75af3ccfae6120a8dd9fcdae0bb1f19fc8ff1e7c32b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0568c1eb3f2405df6f62cc75af3ccfae6120a8dd9fcdae0bb1f19fc8ff1e7c32ba0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a02b29d5d1498f928b76a2e72db82a6ec5de3ef02cd89ae72e363b9303c146908b88d8595c3c075a25c8f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x012490",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60",
+                        "s" : "0x512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916e",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x23acae660f75a8ee2893843c88deda2df2c96425cdee967c626077de7d49b46a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7278a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760d876",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_9_37111_37111_35000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1b0",
-                    "hash" : "0x9a702f8195e912b86566b74d4627132f884c1afadb704bbd7c9cea180e3aa520",
-                    "mixHash" : "0xe049add4237bdd1ec921d026bfc6bb3215b29876ff1b0145c5af1bfa370166b3",
-                    "nonce" : "0xd25e96128bd6f50d",
+                    "hash" : "0x1547b930283706db47131257ee5352b2fafec1cfa2ce494a046a58803ec7a89f",
+                    "mixHash" : "0x1047dd7cc3cb4a2a8c8d5cbe1fe616d9f37fa2526ee4d0c2fd7871790d4af631",
+                    "nonce" : "0x2aacc832e53d66c7",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0e049add4237bdd1ec921d026bfc6bb3215b29876ff1b0145c5af1bfa370166b388d25e96128bd6f50df90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a01047dd7cc3cb4a2a8c8d5cbe1fe616d9f37fa2526ee4d0c2fd7871790d4af631882aacc832e53d66c7f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a702f8195e912b86566b74d4627132f884c1afadb704bbd7c9cea180e3aa520",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1547b930283706db47131257ee5352b2fafec1cfa2ce494a046a58803ec7a89f",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_35000_d0g0v0_Frontier" : {
+    "modexp_9_37111_37111_35000_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/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x012490",
-                    "hash" : "0x36aa046686c925f98894b60ac0d0dd1f53f81b0377c77292f3f70bafbb588e40",
-                    "mixHash" : "0xbf1eb27e22cd0a370a2827d9e92781e695d84ea3a92e9fba2a4177702d4d012f",
-                    "nonce" : "0xc35f238fe9499d3c",
+                    "gasUsed" : "0xf1b0",
+                    "hash" : "0xb944dd71e900d3b3a7bf7d5dae043855fc981cf91ed0de5d7fae647ccf51987f",
+                    "mixHash" : "0xe814d820b4cbcac7143e90687927d3b2bc4388e7a3f8396bd51e7e23f39ddfa0",
+                    "nonce" : "0xd8788502299089a9",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x6572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870",
-                    "stateRoot" : "0xb1e0da7f5bd6031d77ddd5bb8990aa7b5aadecdedd5cdcfd0a29ed7ef99fa79f",
+                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
+                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1e0da7f5bd6031d77ddd5bb8990aa7b5aadecdedd5cdcfd0a29ed7ef99fa79fa0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa06572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0bf1eb27e22cd0a370a2827d9e92781e695d84ea3a92e9fba2a4177702d4d012f88c35f238fe9499d3cf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "rlp" : "0xf90428f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0e814d820b4cbcac7143e90687927d3b2bc4388e7a3f8396bd51e7e23f39ddfa088d8788502299089a9f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36aa046686c925f98894b60ac0d0dd1f53f81b0377c77292f3f70bafbb588e40",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb944dd71e900d3b3a7bf7d5dae043855fc981cf91ed0de5d7fae647ccf51987f",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7278a",
+                "balance" : "0x4563918244f6f4aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760d876",
+                "balance" : "0x0de0b6b3a7610b56",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_35000_d0g0v0_Homestead" : {
+    "modexp_9_37111_37111_35000_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/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xa1604efdd55a8858bb006aeff62c9f9604bfeaf23715cfe2e2c550e116d99181",
-                    "mixHash" : "0xc1d06b9d57f57f6d46dcf50f32ea8dbe9860fc9ae3f308f8b4c4fb2b52b11842",
-                    "nonce" : "0x874da8352d3a17d4",
+                    "hash" : "0x3a1824f472f1e8f3644b37be1931234868f9f7f9f184606db5800d5026e5ab6e",
+                    "mixHash" : "0x70aceb913feeff40814aedd1058f35de7209c98e5581c80bdd0101ee38122be0",
+                    "nonce" : "0xd709b7c13eae79cd",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x6572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1e0da7f5bd6031d77ddd5bb8990aa7b5aadecdedd5cdcfd0a29ed7ef99fa79fa0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa06572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0c1d06b9d57f57f6d46dcf50f32ea8dbe9860fc9ae3f308f8b4c4fb2b52b1184288874da8352d3a17d4f90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1e0da7f5bd6031d77ddd5bb8990aa7b5aadecdedd5cdcfd0a29ed7ef99fa79fa0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa06572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a070aceb913feeff40814aedd1058f35de7209c98e5581c80bdd0101ee38122be088d709b7c13eae79cdf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1604efdd55a8858bb006aeff62c9f9604bfeaf23715cfe2e2c550e116d99181",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3a1824f472f1e8f3644b37be1931234868f9f7f9f184606db5800d5026e5ab6e",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_9_37111_37111_35000_d0g0v0_Metropolis" : {
+    "modexp_9_37111_37111_35000_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/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x012490",
-                    "hash" : "0xab88e925e09a8fc73f97beb1f047f198e8cb53639788688d34b2b897e6eb9d81",
-                    "mixHash" : "0xf929959ee1d0643d9994da73de1c35d450e11aa151dce4b2ac71a60bf8d9298f",
-                    "nonce" : "0x021b190a3c3312fc",
+                    "hash" : "0xfe717d7ed04bd01e492e5189a04ea5d98ec5dae2973637d640002a6067878088",
+                    "mixHash" : "0x42a61967aebb5a209398b209d65b76379ce4eaedd98c10936c3614b032cd6d83",
+                    "nonce" : "0xdd5121bebff0c9fa",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xf1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1",
-                    "stateRoot" : "0x568c1eb3f2405df6f62cc75af3ccfae6120a8dd9fcdae0bb1f19fc8ff1e7c32b",
+                    "receiptTrie" : "0x6572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870",
+                    "stateRoot" : "0xb1e0da7f5bd6031d77ddd5bb8990aa7b5aadecdedd5cdcfd0a29ed7ef99fa79f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0568c1eb3f2405df6f62cc75af3ccfae6120a8dd9fcdae0bb1f19fc8ff1e7c32ba0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa0f1112e559b3c89ccad1c1f59bc7e8077f36657c23a72bc5f0f2ed46fe09593a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a0f929959ee1d0643d9994da73de1c35d450e11aa151dce4b2ac71a60bf8d9298f88021b190a3c3312fcf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
+                "rlp" : "0xf90429f901f9a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0b1e0da7f5bd6031d77ddd5bb8990aa7b5aadecdedd5cdcfd0a29ed7ef99fa79fa0f8803ba41518a67c7bc662012cb3225ef35cbacd37b68b6d9a572719ba8d881fa06572e4852a763aac2d399a4947e1289b1908c0c22a683dc246501480e235c870b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830124908203e880a042a61967aebb5a209398b209d65b76379ce4eaedd98c10936c3614b032cd6d8388dd5121bebff0c9faf90229f9022601018301249094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba00b542799923bf6113cd931e4e801d7650306d511565b88e3f73fc0bd8e96da60a0512b70ad36b6826723b4c470bbfd67b74a695faf6d966d30a18123742808916ec0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab88e925e09a8fc73f97beb1f047f198e8cb53639788688d34b2b897e6eb9d81",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfe717d7ed04bd01e492e5189a04ea5d98ec5dae2973637d640002a6067878088",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7278a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json
index c33d5cdab..f605bcab0 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_9_3711_37111_25000_d0g0v0_EIP150" : {
+    "modexp_9_3711_37111_25000_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/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xf1b0",
-                    "hash" : "0x199fa65f3c838b23b735544d52f130552bd56171ce6a9dfc0a6d1dec1dd6035f",
-                    "mixHash" : "0x3e53473944cf8bcdb91b771970df66df04d3caa416e5a1df35dbb1f5a232b46d",
-                    "nonce" : "0xe8adf60d87cc082d",
+                    "gasUsed" : "0xfd80",
+                    "hash" : "0x89a7675d70bee694ba45ebaf4cacd8e6a6c13b6dd1d3435b1727d06ecec4c2c8",
+                    "mixHash" : "0x3c8a7ce509fbe458bc6f906d6929cbe40cbda32b57e5349b7458819da5b940d9",
+                    "nonce" : "0x7f15b868f089d2fd",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
-                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
+                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
+                    "stateRoot" : "0xec2cfc1dfaf7f8394718146c86b8f20fbf65f7b6599e98386012c1fa868bac30",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a03e53473944cf8bcdb91b771970df66df04d3caa416e5a1df35dbb1f5a232b46d88e8adf60d87cc082df90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ec2cfc1dfaf7f8394718146c86b8f20fbf65f7b6599e98386012c1fa868bac30a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a03c8a7ce509fbe458bc6f906d6929cbe40cbda32b57e5349b7458819da5b940d9887f15b868f089d2fdf90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x199fa65f3c838b23b735544d52f130552bd56171ce6a9dfc0a6d1dec1dd6035f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x89a7675d70bee694ba45ebaf4cacd8e6a6c13b6dd1d3435b1727d06ecec4c2c8",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -121,15 +121,22 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f6f4aa",
+                "balance" : "0x4563918244f7007a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a7610b56",
+                "balance" : "0x0de0b6b3a760ff86",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -140,7 +147,6 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -224,10 +230,241 @@
             }
         }
     },
-    "modexp_9_3711_37111_25000_d0g0v0_EIP158" : {
+    "modexp_9_3711_37111_25000_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/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x3535353535353535353535353535353535353535",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xfd80",
+                    "hash" : "0xa9e7a241f0befe321efbf41f055fb591973ca6749c56a281510075b5a8925bcf",
+                    "mixHash" : "0x11338d1284283ca29a27f63229c0fd11adb52f5dba3ceef0484e3f5da63d44e0",
+                    "nonce" : "0xc34bb8f50ac5315d",
+                    "number" : "0x01",
+                    "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
+                    "stateRoot" : "0xec2cfc1dfaf7f8394718146c86b8f20fbf65f7b6599e98386012c1fa868bac30",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ec2cfc1dfaf7f8394718146c86b8f20fbf65f7b6599e98386012c1fa868bac30a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a011338d1284283ca29a27f63229c0fd11adb52f5dba3ceef0484e3f5da63d44e088c34bb8f50ac5315df90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "transactions" : [
+                    {
+                        "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0xfd80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x35b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bb",
+                        "s" : "0x663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407",
+                        "to" : "0xc305c901078781c232a2a521c2af7980f8385ee9",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x3535353535353535353535353535353535353535",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x55ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa9e7a241f0befe321efbf41f055fb591973ca6749c56a281510075b5a8925bcf",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x4563918244f7007a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a760ff86",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3535353535353535353535353535353535353535" : {
+                "balance" : "0x0202fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                "balance" : "0x0de0b6b3a761fd06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                "balance" : "0x00",
+                "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_9_3711_37111_25000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xf1b0",
-                    "hash" : "0x14d2427870fed06ce2356c9bde149e7d86f6d587ef762a0c9cd8dcac86052294",
-                    "mixHash" : "0x594038c3a60731de1010faa0f38783ad89845ace0296b1b6ab07ff48c896049d",
-                    "nonce" : "0x5ac0c5a3d97f33b8",
+                    "hash" : "0x0edf38af3ce74699e59f9565e74f3f7ebd9b4aa90ec86ea81a7460928a5907f4",
+                    "mixHash" : "0x20778e2166b01b0b61fa971478c74187e2cc7021097ac3b6c1067646ed72012b",
+                    "nonce" : "0xc40698f25c0336a8",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
@@ -250,7 +487,7 @@
                     "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a0594038c3a60731de1010faa0f38783ad89845ace0296b1b6ab07ff48c896049d885ac0c5a3d97f33b8f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a020778e2166b01b0b61fa971478c74187e2cc7021097ac3b6c1067646ed72012b88c40698f25c0336a8f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -287,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14d2427870fed06ce2356c9bde149e7d86f6d587ef762a0c9cd8dcac86052294",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0edf38af3ce74699e59f9565e74f3f7ebd9b4aa90ec86ea81a7460928a5907f4",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -449,10 +686,10 @@
             }
         }
     },
-    "modexp_9_3711_37111_25000_d0g0v0_Frontier" : {
+    "modexp_9_3711_37111_25000_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/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +700,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xfd80",
-                    "hash" : "0xbfe2b60638eef28bb850cf6899338a84d3b73aae5a7d312661266b7e33131650",
-                    "mixHash" : "0x052cd4dca2e9a3760209e65ef7742b764ef8e3695f3f136cfeee7172d7359134",
-                    "nonce" : "0xbdd4ef4ef3c4ec4e",
+                    "gasUsed" : "0xf1b0",
+                    "hash" : "0x451f2e055e1d7bcae3c2812a54fbda6425cef350c9a0104d2848f495989bb0e1",
+                    "mixHash" : "0x9d005ebb2fc55e320829245fcebe7d12686109592e0f719821d970630a773b2f",
+                    "nonce" : "0xe6f9edf66d982ca8",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0x7030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595",
-                    "stateRoot" : "0xdcc87673f588e0a98b9b8f235141d78ca0ba34d7ef1085a70d9309f7767f3048",
+                    "receiptTrie" : "0x31e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289",
+                    "stateRoot" : "0x33d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dcc87673f588e0a98b9b8f235141d78ca0ba34d7ef1085a70d9309f7767f3048a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a07030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0052cd4dca2e9a3760209e65ef7742b764ef8e3695f3f136cfeee7172d735913488bdd4ef4ef3c4ec4ef90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a033d2d7585088069d0daf402ff8757d0544056981eb455ad751897c920c7773cea0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a031e57c3578a703beeb8cb61d860f209c16256a5eaa7848d36339ed22c5c71289b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082f1b08203e880a09d005ebb2fc55e320829245fcebe7d12686109592e0f719821d970630a773b2f88e6f9edf66d982ca8f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -512,8 +749,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfe2b60638eef28bb850cf6899338a84d3b73aae5a7d312661266b7e33131650",
-        "network" : "Frontier",
+        "lastblockhash" : "0x451f2e055e1d7bcae3c2812a54fbda6425cef350c9a0104d2848f495989bb0e1",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -572,14 +809,14 @@
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
-                "balance" : "0x4563918244f7007a",
+                "balance" : "0x4563918244f6f4aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                "balance" : "0x0de0b6b3a760ff86",
+                "balance" : "0x0de0b6b3a7610b56",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -590,6 +827,7 @@
                 "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x012893657d8eb2efad4de0a91bcd0e39ad9837745dec3ea923737ea803fc8e3d"
                 }
             }
         },
@@ -673,10 +911,10 @@
             }
         }
     },
-    "modexp_9_3711_37111_25000_d0g0v0_Homestead" : {
+    "modexp_9_3711_37111_25000_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/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -688,9 +926,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0x011ef271de16d92bf2b4862dc6311d4779c913c0ce1302dc41d098eb6c40f7b0",
-                    "mixHash" : "0x7ee775f86df68af3ba7df53d616d11e187c7390c86e0ba6288d618577b8e17f7",
-                    "nonce" : "0x2186c9d0f782a871",
+                    "hash" : "0xa6091d022ed4b8268cc16f13b19980e816a584e22ebe55385bbbc2abea01871b",
+                    "mixHash" : "0xe2e472dddb0b8ff099baa8b433e34712a60dae7e66f5c714a6216b2ed0afce84",
+                    "nonce" : "0x6d84ba2ddd58ae48",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
                     "receiptTrie" : "0x7030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595",
@@ -699,7 +937,7 @@
                     "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dcc87673f588e0a98b9b8f235141d78ca0ba34d7ef1085a70d9309f7767f3048a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a07030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a07ee775f86df68af3ba7df53d616d11e187c7390c86e0ba6288d618577b8e17f7882186c9d0f782a871f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dcc87673f588e0a98b9b8f235141d78ca0ba34d7ef1085a70d9309f7767f3048a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a07030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0e2e472dddb0b8ff099baa8b433e34712a60dae7e66f5c714a6216b2ed0afce84886d84ba2ddd58ae48f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -736,8 +974,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x011ef271de16d92bf2b4862dc6311d4779c913c0ce1302dc41d098eb6c40f7b0",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa6091d022ed4b8268cc16f13b19980e816a584e22ebe55385bbbc2abea01871b",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -897,10 +1135,10 @@
             }
         }
     },
-    "modexp_9_3711_37111_25000_d0g0v0_Metropolis" : {
+    "modexp_9_3711_37111_25000_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/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -912,18 +1150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xfd80",
-                    "hash" : "0xd3a8bee6a3c9f20c88b6610706b69c5fa47041b8a2da770e427812ca1111b659",
-                    "mixHash" : "0xa5bcbab5d5e3dae379f66ad71cfe4c5c28b61e47669a3300674dfbb09670df7a",
-                    "nonce" : "0x15fe12bd66d7178d",
+                    "hash" : "0xbfb06a041c141e2aeb32d42e3c486406c01dc8de196c7eff025dd9df3ab7b91b",
+                    "mixHash" : "0x2f413385e731541f47f523377e33e63b3f1d76848bcbce85dac65de62a10591d",
+                    "nonce" : "0x56b900199a94bf86",
                     "number" : "0x01",
                     "parentHash" : "0xd383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadec",
-                    "receiptTrie" : "0xf85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0",
-                    "stateRoot" : "0xec2cfc1dfaf7f8394718146c86b8f20fbf65f7b6599e98386012c1fa868bac30",
+                    "receiptTrie" : "0x7030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595",
+                    "stateRoot" : "0xdcc87673f588e0a98b9b8f235141d78ca0ba34d7ef1085a70d9309f7767f3048",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0ec2cfc1dfaf7f8394718146c86b8f20fbf65f7b6599e98386012c1fa868bac30a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a0f85ef3979754b7ecfd28d1ea2638a3080ebe3334eadd0777129541ab76ba07c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a0a5bcbab5d5e3dae379f66ad71cfe4c5c28b61e47669a3300674dfbb09670df7a8815fe12bd66d7178df90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
+                "rlp" : "0xf90427f901f8a0d383ab4748604fc50dc407fce85351f90b7a0ea816a0be0e4cb6713308fcadeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a0dcc87673f588e0a98b9b8f235141d78ca0ba34d7ef1085a70d9309f7767f3048a0d53a1c47f6565aab44bd14567046ae0ed3e120c5c4ffcffab066944a1dc2c145a07030b5dd76d57611dbc4d8a373b1c02b695bbcfeab52ee21ecabefe6d3af8595b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082fd808203e880a02f413385e731541f47f523377e33e63b3f1d76848bcbce85dac65de62a10591d8856b900199a94bf86f90228f90225010182fd8094c305c901078781c232a2a521c2af7980f8385ee980b901c430c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97000000000000000000000000000000000000000000000000000000000000001ba035b83d81965c174c0ac0fc425c81fd8330ab037755144acd7e0b836f638633bba0663b7580b33e46f6718ab9bc968b2766210dee51a72cd4caa58ffcd61d983407c0",
                 "transactions" : [
                     {
                         "data" : "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000",
@@ -960,8 +1198,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347943535353535353535353535353535353535353535a055ca96809662e70d5a0514e501e9d27f6608de3be5a5c3cd567bb4f99141273ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3a8bee6a3c9f20c88b6610706b69c5fa47041b8a2da770e427812ca1111b659",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbfb06a041c141e2aeb32d42e3c486406c01dc8de196c7eff025dd9df3ab7b91b",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
@@ -1019,13 +1257,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x4563918244f7007a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json
index 87d677737..d49a45672 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d0g0v0_EIP150" : {
+    "modexp_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/stPreCompiledContracts/modexp_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xca91",
-                    "hash" : "0xaa91325a58c9ccaddc3315d6c8c4494dc8f497634216dc2863bda34e792f2e98",
-                    "mixHash" : "0x70587cf95ad245ddde30c40489165be4a3e4b61974dd13962c7f052fe55c0067",
-                    "nonce" : "0xb7dfb65cf41d1136",
+                    "gasUsed" : "0x010f5c",
+                    "hash" : "0x325b048bc7d7e073ed3c7a8b8142c3df7713d78a5f5cca7b87c4cb78d61b867a",
+                    "mixHash" : "0xfa02ea5821d0ecbc9492e1df4d3d36ff9e1ad86da9ef8e42cc2a68e7d8e91e2c",
+                    "nonce" : "0x97feb137914ed7b3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
-                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
+                    "receiptTrie" : "0x8fc2aa3839c658179d98dfb646255246eaafdda2ff00efe1c5717ce2182d49f7",
+                    "stateRoot" : "0x020cc69dd86ed2b9dbe6ab0ece75f8cf9ac2a6e80f36165d01df532ee339ea2f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a070587cf95ad245ddde30c40489165be4a3e4b61974dd13962c7f052fe55c006788b7dfb65cf41d1136f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0020cc69dd86ed2b9dbe6ab0ece75f8cf9ac2a6e80f36165d01df532ee339ea2fa0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08fc2aa3839c658179d98dfb646255246eaafdda2ff00efe1c5717ce2182d49f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010f5c8203e880a0fa02ea5821d0ecbc9492e1df4d3d36ff9e1ad86da9ef8e42cc2a68e7d8e91e2c8897feb137914ed7b3f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa91325a58c9ccaddc3315d6c8c4494dc8f497634216dc2863bda34e792f2e98",
-        "network" : "EIP150",
+        "lastblockhash" : "0x325b048bc7d7e073ed3c7a8b8142c3df7713d78a5f5cca7b87c4cb78d61b867a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca91",
+                "balance" : "0x4563918244f50f5c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f356f",
+                "balance" : "0x3635c9adc5de9ef0a4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d0g0v0_EIP158" : {
+    "modexp_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x010f5c",
+                    "hash" : "0xfbe304fbb29396844ecaeb16391312ba966f7ddba610aca07ef6af04582091ad",
+                    "mixHash" : "0x316391cd653c99cd7016caa96393c97b9d11cdb5ded96afdb8a8e70f663da6eb",
+                    "nonce" : "0x95590dc3eb0cd427",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x8fc2aa3839c658179d98dfb646255246eaafdda2ff00efe1c5717ce2182d49f7",
+                    "stateRoot" : "0x020cc69dd86ed2b9dbe6ab0ece75f8cf9ac2a6e80f36165d01df532ee339ea2f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0020cc69dd86ed2b9dbe6ab0ece75f8cf9ac2a6e80f36165d01df532ee339ea2fa0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08fc2aa3839c658179d98dfb646255246eaafdda2ff00efe1c5717ce2182d49f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010f5c8203e880a0316391cd653c99cd7016caa96393c97b9d11cdb5ded96afdb8a8e70f663da6eb8895590dc3eb0cd427f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78a",
+                        "s" : "0x6ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfbe304fbb29396844ecaeb16391312ba966f7ddba610aca07ef6af04582091ad",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50f5c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9ef0a4",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_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/stPreCompiledContracts/modexp_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca91",
-                    "hash" : "0xe8f1e96e76a117fbf999e1673756b937c90ef982c3fadbd1d8786489cd061fca",
-                    "mixHash" : "0x948f43750308fd7baeb8ef6b770ba4cd89207745bc37a5b038c2bb4b85f5d83e",
-                    "nonce" : "0xc55be2939f2a88eb",
+                    "hash" : "0xb5922d4ad9d34cb648782c2ce7179814b5ceea21846a5974b96b323f8ebfe448",
+                    "mixHash" : "0xa97edfd3ee6071511eddc82aefe0c4fc30a93c29a93dfcf96aa2ec99c3622b44",
+                    "nonce" : "0x7c309d78b3f26de7",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a0948f43750308fd7baeb8ef6b770ba4cd89207745bc37a5b038c2bb4b85f5d83e88c55be2939f2a88ebf90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a0a97edfd3ee6071511eddc82aefe0c4fc30a93c29a93dfcf96aa2ec99c3622b44887c309d78b3f26de7f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8f1e96e76a117fbf999e1673756b937c90ef982c3fadbd1d8786489cd061fca",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb5922d4ad9d34cb648782c2ce7179814b5ceea21846a5974b96b323f8ebfe448",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d0g0v0_Frontier" : {
+    "modexp_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/stPreCompiledContracts/modexp_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x7a4174d13e378dfb19f296c0d8dc588d61eea4bea3b0d06495cbdd62f79d2856",
-                    "mixHash" : "0xcbd3715a7ed9d85a16ccdbb3604bc2cd6e0ed5aa933e3bc63ff763631100d733",
-                    "nonce" : "0x1898da0cf96182ef",
+                    "gasUsed" : "0xca91",
+                    "hash" : "0x6de4642af2d27fc519607133b7329d6a2c3b8be8ce421002c9be4ce8c309e001",
+                    "mixHash" : "0x87a7e362dbe69c97e03b9d202ae5a75189700d5b94fcc3a5a7fda1d3d4344de5",
+                    "nonce" : "0x96448dc28d9c5850",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xc84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0c",
+                    "stateRoot" : "0xe9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90308f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0cbd3715a7ed9d85a16ccdbb3604bc2cd6e0ed5aa933e3bc63ff763631100d733881898da0cf96182eff90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90306f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9593314e3f16a702772eaa3f21569c4b4fe7f31126fade32aa2bc6ddfd654c7a0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a0c84b322ae5f52c2e923ed8d8c79fbdcb8bbe884cef21d0adc7f91a0ac04b8b0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca918203e880a087a7e362dbe69c97e03b9d202ae5a75189700d5b94fcc3a5a7fda1d3d4344de58896448dc28d9c5850f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a4174d13e378dfb19f296c0d8dc588d61eea4bea3b0d06495cbdd62f79d2856",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6de4642af2d27fc519607133b7329d6a2c3b8be8ce421002c9be4ce8c309e001",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ca91",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f356f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d0g0v0_Homestead" : {
+    "modexp_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/stPreCompiledContracts/modexp_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xb1a0d9e6fded8811ddf161ed19be995886a92693ca56b5d34990aa811081473c",
-                    "mixHash" : "0x12bdc86491796d23dd676534186971efaf51d86fdc5f4c3f396cbd2385d0c26e",
-                    "nonce" : "0xe9dff11591413ff9",
+                    "hash" : "0x833c9440f2626ddc42039fbd8cb4300d41e31aa6ac56c00b67348f2c568d1022",
+                    "mixHash" : "0x3558da3b2da14053a8cbbe6dabad69ea52f047491aff01dbc24624fa57ee1bc8",
+                    "nonce" : "0x70d8b960c1f816a4",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90308f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a012bdc86491796d23dd676534186971efaf51d86fdc5f4c3f396cbd2385d0c26e88e9dff11591413ff9f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90308f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a03558da3b2da14053a8cbbe6dabad69ea52f047491aff01dbc24624fa57ee1bc88870d8b960c1f816a4f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1a0d9e6fded8811ddf161ed19be995886a92693ca56b5d34990aa811081473c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x833c9440f2626ddc42039fbd8cb4300d41e31aa6ac56c00b67348f2c568d1022",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d0g0v0_Metropolis" : {
+    "modexp_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/stPreCompiledContracts/modexp_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x010f5c",
-                    "hash" : "0xe757b6f6a280bd8c54eae808b805f6c6b64b22086c6b70f0361e4bafac4d3e4b",
-                    "mixHash" : "0x506166ed8cbaa6c05379971f29044bec01074bd548c2699578c1348ff6a9516e",
-                    "nonce" : "0x1d59948de37f9695",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x549219a8d30bd71036bae60f6c34da94ddb1673bb7eabc4540eb5acf7091603c",
+                    "mixHash" : "0x7bba06918b4540d065a64a83149979c8c396d97e1778b7a9fc182a63d4d3c1e8",
+                    "nonce" : "0xcacca52c10f531a2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8fc2aa3839c658179d98dfb646255246eaafdda2ff00efe1c5717ce2182d49f7",
-                    "stateRoot" : "0x020cc69dd86ed2b9dbe6ab0ece75f8cf9ac2a6e80f36165d01df532ee339ea2f",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901faa070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0020cc69dd86ed2b9dbe6ab0ece75f8cf9ac2a6e80f36165d01df532ee339ea2fa0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08fc2aa3839c658179d98dfb646255246eaafdda2ff00efe1c5717ce2182d49f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40083010f5c8203e880a0506166ed8cbaa6c05379971f29044bec01074bd548c2699578c1348ff6a9516e881d59948de37f9695f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
+                "rlp" : "0xf90308f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c6801fb87855d56a9f042db07d08e830c2dbe36f316d83412e875cf7a7f64f01a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a07bba06918b4540d065a64a83149979c8c396d97e1778b7a9fc182a63d4d3c1e888cacca52c10f531a2f90106f9010380018405f5e10094100000000000000000000000000000000000000080b8a100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ca024f0a7f9932e57fc8066505ca7cc1eb062ab31373c2b5aacb23236c40e67f78aa06ad44feaf558663376e90b3d8b2f477210baa72a43c20f9f09dbe784809c3f89c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe757b6f6a280bd8c54eae808b805f6c6b64b22086c6b70f0361e4bafac4d3e4b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x549219a8d30bd71036bae60f6c34da94ddb1673bb7eabc4540eb5acf7091603c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50f5c",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9ef0a4",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json
index 7084d9235..8b3011e97 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d10g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d10g0v0_EIP150" : {
+    "modexp_d10g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d10g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x63d27aaf0e4eb2573b558ab2e13e23c250bec39ab1a1373087927592732fa563",
-                    "mixHash" : "0xe3eb14194ebcb05e6845ce64f9faeb254c17f6c060a85d2293573034a43c7ac0",
-                    "nonce" : "0x76f666d78cc22a63",
+                    "hash" : "0x5658320002d35672b982e9ff9dd8100c9ca4082e371bb2c608c40de2b89becd0",
+                    "mixHash" : "0x09210c89e03887319d2207ba5e26d7f26ee3ca59c6f66c70871eb4da810cddea",
+                    "nonce" : "0xcf5479564404fa42",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
-                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0e3eb14194ebcb05e6845ce64f9faeb254c17f6c060a85d2293573034a43c7ac08876f666d78cc22a63f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a009210c89e03887319d2207ba5e26d7f26ee3ca59c6f66c70871eb4da810cddea88cf5479564404fa42f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63d27aaf0e4eb2573b558ab2e13e23c250bec39ab1a1373087927592732fa563",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5658320002d35672b982e9ff9dd8100c9ca4082e371bb2c608c40de2b89becd0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d10g0v0_EIP158" : {
+    "modexp_d10g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d10g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x6c04ef6586b4849568f764397636e196e5f2c16550cfcda1d308651886fea956",
-                    "mixHash" : "0xd864cbf51ec47a4d22a851a0e65ee66c820cdc0b979d6517fba9eee656d9373e",
-                    "nonce" : "0xf4cc7b2c876b9841",
+                    "hash" : "0x946a2239c210cd450f0145bb2e645a18bb48e4f05cb5d2bab696b518d7b91202",
+                    "mixHash" : "0xd77023057ff4b04dd4f3f37e4e3323df136a78fd46389b1ce6c97b31ca57c2e7",
+                    "nonce" : "0xedfab1d54387f7b2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0d77023057ff4b04dd4f3f37e4e3323df136a78fd46389b1ce6c97b31ca57c2e788edfab1d54387f7b2f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17",
+                        "s" : "0x61a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x946a2239c210cd450f0145bb2e645a18bb48e4f05cb5d2bab696b518d7b91202",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d10g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d10g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x81812e2b4774d271818147407433aac7c12afea79ac8bddca89bb1c96b1ae2bc",
+                    "mixHash" : "0xc042fc402364809b0a4887153aaea53d39b996ab0b392c852c3e3b7984527110",
+                    "nonce" : "0xe0460a47b3d794ef",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0d864cbf51ec47a4d22a851a0e65ee66c820cdc0b979d6517fba9eee656d9373e88f4cc7b2c876b9841f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0c042fc402364809b0a4887153aaea53d39b996ab0b392c852c3e3b798452711088e0460a47b3d794eff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c04ef6586b4849568f764397636e196e5f2c16550cfcda1d308651886fea956",
-        "network" : "EIP158",
+        "lastblockhash" : "0x81812e2b4774d271818147407433aac7c12afea79ac8bddca89bb1c96b1ae2bc",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d10g0v0_Frontier" : {
+    "modexp_d10g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d10g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xcb6ca106c9473168b3c13c7b6b849c89962e426b9956dcef6da2b6825938ae45",
-                    "mixHash" : "0x00b02218383e6c79e5917dd260d32f9e1f5f2bcf85ff20ea99a417aa36e6326c",
-                    "nonce" : "0x6ab946a96dc9255c",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xc8a954fe454b363cb716e4a1e020089375a7388897bffaa3ddd2553fb80ef242",
+                    "mixHash" : "0xf75c84268e7a278eebd4ff318d1ed6be6d135d5b9329410da81b72636d0060e0",
+                    "nonce" : "0x04407c794cb52a01",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a000b02218383e6c79e5917dd260d32f9e1f5f2bcf85ff20ea99a417aa36e6326c886ab946a96dc9255cf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f75c84268e7a278eebd4ff318d1ed6be6d135d5b9329410da81b72636d0060e08804407c794cb52a01f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb6ca106c9473168b3c13c7b6b849c89962e426b9956dcef6da2b6825938ae45",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc8a954fe454b363cb716e4a1e020089375a7388897bffaa3ddd2553fb80ef242",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9d3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f462d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d10g0v0_Homestead" : {
+    "modexp_d10g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d10g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xf9355c0660b42ce12b6aa4cd1649843c90d7297ef86069b8a4b7fd7af5f32776",
-                    "mixHash" : "0x85f337f6785557c2c6295e1de2bcca2152baef6f5056c5dbd233a3c669cafd04",
-                    "nonce" : "0x15bec55e2ea81037",
+                    "hash" : "0x7845e62546e6d3b4183192ed7157b930b012c9abc3b7b1f0148c6df51c292f4b",
+                    "mixHash" : "0xc7a45e11675c5672b3ac1081e2f9b1557727a83061b44e9b733be6647dfabb7f",
+                    "nonce" : "0x994cf22598210e59",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a085f337f6785557c2c6295e1de2bcca2152baef6f5056c5dbd233a3c669cafd048815bec55e2ea81037f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0c7a45e11675c5672b3ac1081e2f9b1557727a83061b44e9b733be6647dfabb7f88994cf22598210e59f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9355c0660b42ce12b6aa4cd1649843c90d7297ef86069b8a4b7fd7af5f32776",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7845e62546e6d3b4183192ed7157b930b012c9abc3b7b1f0148c6df51c292f4b",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d10g0v0_Metropolis" : {
+    "modexp_d10g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d10g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9d3",
-                    "hash" : "0x68d6d1445dc580a9bcd12a67820dc518f85b4ed0c5ba2bafabbdceed20e92e70",
-                    "mixHash" : "0x4836d43828e6c0367190e932ba888b7f30705157773bc1ff1dcd218251592bb4",
-                    "nonce" : "0x1d1d95b9ca1aefa3",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x7dacf2f81e73adbc342bc26422bfadaaad265d2b933e1834efd733b6921a8ce9",
+                    "mixHash" : "0xdc9a16ab3956780163b9c29b6c42ea5201de48380c6a24fc91fcfca0ccafed5c",
+                    "nonce" : "0x10fdc58772776ba5",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
-                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a04836d43828e6c0367190e932ba888b7f30705157773bc1ff1dcd218251592bb4881d1d95b9ca1aefa3f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada06e7e288abfe778d526a1a161106e4c8cfb3c33b178c231e69e9fc3dbb439a52ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0dc9a16ab3956780163b9c29b6c42ea5201de48380c6a24fc91fcfca0ccafed5c8810fdc58772776ba5f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010003041ba091cfbf9bc159d4d216cfd2f7977c4d5c75fba456dfb3dcefde4fcdbc5b6b2d17a061a777c5aecd6a21186ffab9da37686674d6035f324cd542633366d873fd0b58c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68d6d1445dc580a9bcd12a67820dc518f85b4ed0c5ba2bafabbdceed20e92e70",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7dacf2f81e73adbc342bc26422bfadaaad265d2b933e1834efd733b6921a8ce9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9d3",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f462d",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json
index a9558d923..d49b640e8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d11g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d11g0v0_EIP150" : {
+    "modexp_d11g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d11g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9d3",
-                    "hash" : "0xfedb9ad2cfd9ad7efc53d5ff93a78e7860a6182d3c7f5e89f67c9f855065ddd2",
-                    "mixHash" : "0x90456afef1036a96ec581abea7c0d9d722194e35fc384b583c172364a4a87cff",
-                    "nonce" : "0x6566641da8323900",
+                    "gasUsed" : "0xf46b",
+                    "hash" : "0x60464ace2594908c5f875d71b9f968b8029b8aea938ddae22e458fcbe8439a1b",
+                    "mixHash" : "0x64a26bd05092c112a4c65cad85b141e5568eb05d307e7bd8b5b3bf6730cd3956",
+                    "nonce" : "0x3b36cca86f9b33a0",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
-                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
+                    "stateRoot" : "0xb4bdf0640107401d7de82283aedb26e0de964e807df9f6bb7af2de3f1cfdb4f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a090456afef1036a96ec581abea7c0d9d722194e35fc384b583c172364a4a87cff886566641da8323900f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4bdf0640107401d7de82283aedb26e0de964e807df9f6bb7af2de3f1cfdb4f3a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a064a26bd05092c112a4c65cad85b141e5568eb05d307e7bd8b5b3bf6730cd3956883b36cca86f9b33a0f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfedb9ad2cfd9ad7efc53d5ff93a78e7860a6182d3c7f5e89f67c9f855065ddd2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x60464ace2594908c5f875d71b9f968b8029b8aea938ddae22e458fcbe8439a1b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9d3",
+                "balance" : "0x4563918244f4f46b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f462d",
+                "balance" : "0x3635c9adc5de9f0b95",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d11g0v0_EIP158" : {
+    "modexp_d11g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d11g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf46b",
+                    "hash" : "0x74b1710cbc694540b2e9a6aff8cf1704936ae6b9a88cea538e20bacdc3495d6a",
+                    "mixHash" : "0x223b449a5345bb841d3499faee681ddb4ab493e0718a5bf5a5c637bd5f0d630c",
+                    "nonce" : "0xc24aa4ced70d093a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
+                    "stateRoot" : "0xb4bdf0640107401d7de82283aedb26e0de964e807df9f6bb7af2de3f1cfdb4f3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4bdf0640107401d7de82283aedb26e0de964e807df9f6bb7af2de3f1cfdb4f3a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a0223b449a5345bb841d3499faee681ddb4ab493e0718a5bf5a5c637bd5f0d630c88c24aa4ced70d093af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23",
+                        "s" : "0x066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x74b1710cbc694540b2e9a6aff8cf1704936ae6b9a88cea538e20bacdc3495d6a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f46b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b95",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d11g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d11g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x13003b0bc160c00ef9e5be43ddfe364cf69ac2e6d3e5dd731d503a7ac6e66b91",
-                    "mixHash" : "0xfbdd970aa854a6497ac34741e6bbd323ceef644ea824c823432aa57cdd9c3d64",
-                    "nonce" : "0x63d21d95d657b788",
+                    "hash" : "0xb18a38c65189ca622e4a5db6806dbb24cf9314d9a5f0bf550b544a720c05a1f9",
+                    "mixHash" : "0x79c3495ba923a64513c99d0fceec5aeae3fb00c7788e7d0435b340b4b13ed6af",
+                    "nonce" : "0x30076e82a39843b1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0fbdd970aa854a6497ac34741e6bbd323ceef644ea824c823432aa57cdd9c3d648863d21d95d657b788f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a079c3495ba923a64513c99d0fceec5aeae3fb00c7788e7d0435b340b4b13ed6af8830076e82a39843b1f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13003b0bc160c00ef9e5be43ddfe364cf69ac2e6d3e5dd731d503a7ac6e66b91",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb18a38c65189ca622e4a5db6806dbb24cf9314d9a5f0bf550b544a720c05a1f9",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d11g0v0_Frontier" : {
+    "modexp_d11g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d11g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x563333cde22b1d58002d07535bb26b9f64f72cca977b4c0e6ab2476a0615c7f8",
-                    "mixHash" : "0x01c91fd0a213ec016607dd752eaf9e6eb323c6cbc6b0dcf975aaf1c0618a484a",
-                    "nonce" : "0xf61ef50a6db92a6e",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xfe5589c3432780900408c8475c608fc5571050c8aa633c056e6ee53986edf11e",
+                    "mixHash" : "0x0979d4af51d922b9176e49ebfff4e39f7e160f8c3c88b4232f610e6f501a9493",
+                    "nonce" : "0xf1a5b28190b9479d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a001c91fd0a213ec016607dd752eaf9e6eb323c6cbc6b0dcf975aaf1c0618a484a88f61ef50a6db92a6ef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a00979d4af51d922b9176e49ebfff4e39f7e160f8c3c88b4232f610e6f501a949388f1a5b28190b9479df8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x563333cde22b1d58002d07535bb26b9f64f72cca977b4c0e6ab2476a0615c7f8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfe5589c3432780900408c8475c608fc5571050c8aa633c056e6ee53986edf11e",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9d3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f462d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d11g0v0_Homestead" : {
+    "modexp_d11g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d11g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x107b32ccfedd4e71438df30f3a1139339196616c1d898a590d4bfdd69e375e3d",
-                    "mixHash" : "0x703fe553441688c2d4dd0f17a2f4fdc327cc0f9ff0d1e46d6fb960b9617bf111",
-                    "nonce" : "0xe43d9170536a540a",
+                    "hash" : "0x5babcc2b58de207bdbe15edf2755b787228ee90842c67dfa98ae1bdd9ccd998d",
+                    "mixHash" : "0x9014cd58f17d79ace0c2c5d2b6f2dc7d523e66ede291033108a10971179e3441",
+                    "nonce" : "0x45aff63c84a4b35a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0703fe553441688c2d4dd0f17a2f4fdc327cc0f9ff0d1e46d6fb960b9617bf11188e43d9170536a540af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a09014cd58f17d79ace0c2c5d2b6f2dc7d523e66ede291033108a10971179e34418845aff63c84a4b35af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x107b32ccfedd4e71438df30f3a1139339196616c1d898a590d4bfdd69e375e3d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5babcc2b58de207bdbe15edf2755b787228ee90842c67dfa98ae1bdd9ccd998d",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d11g0v0_Metropolis" : {
+    "modexp_d11g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d11g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf46b",
-                    "hash" : "0xbdf0cfcbadaa327d650ce40f2a036d016aec0b975de1af4653ce5d32e365be97",
-                    "mixHash" : "0xca2e4761512ecc8e1e37fef7ceee4842ea1e73e5f05d664749ddbbf716b4f0e6",
-                    "nonce" : "0xaf9efed07f6e16d4",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x8bbcfca63e3d3e0f243cda6dea3b14e4b545a76bfeec9312691c521d1671a7e7",
+                    "mixHash" : "0x81d74592977191f29b853ade5d5b3d59d8b22b74a4ca61f00e2d9f4d6290519c",
+                    "nonce" : "0x743db3cc3c5d2438",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x0d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81",
-                    "stateRoot" : "0xb4bdf0640107401d7de82283aedb26e0de964e807df9f6bb7af2de3f1cfdb4f3",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x44c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4bdf0640107401d7de82283aedb26e0de964e807df9f6bb7af2de3f1cfdb4f3a044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a00d75c083cfb2370ab30f433b9b7e25428b56e328b18df4df560920f415e14a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f46b8203e880a0ca2e4761512ecc8e1e37fef7ceee4842ea1e73e5f05d664749ddbbf716b4f0e688af9efed07f6e16d4f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada044c2473c78390afc6fe16be02ff3c83c2e7b1d2d0e823ed8a86baaeb5e239d84a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a081d74592977191f29b853ade5d5b3d59d8b22b74a4ca61f00e2d9f4d6290519c88743db3cc3c5d2438f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010200041ba04a74ba274b454cd9a23ff05aba90bd0d826e20c2e4db0adf703f8e1fc7f43e23a0066b26e21991aa9bd24a1de4081746d27ffcfa6c4214af1b76db21c5cfaa38a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdf0cfcbadaa327d650ce40f2a036d016aec0b975de1af4653ce5d32e365be97",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8bbcfca63e3d3e0f243cda6dea3b14e4b545a76bfeec9312691c521d1671a7e7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f46b",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0b95",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json
index f9b383381..21fa2455e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d12g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d12g0v0_EIP150" : {
+    "modexp_d12g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d12g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x6077f05613b8d93d8b50ac9cb83a1da6af222874dc0edaf13069623e4fa3ccaf",
-                    "mixHash" : "0xe5131446b41cd9b3b02e6c2524330b0bcf30ccd2508f8953915df75483adfc02",
-                    "nonce" : "0xb6560257ac3672fd",
+                    "hash" : "0xf69672897fd035d50e94af67612c9ec62dff4666769477965421cba7ae2b9468",
+                    "mixHash" : "0xea6a0edc062d44e94779c2aa67ffbeb9a1f04f9283d22e0f1e2742a7d01154b5",
+                    "nonce" : "0xa727960b727a9ed8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
-                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0e5131446b41cd9b3b02e6c2524330b0bcf30ccd2508f8953915df75483adfc0288b6560257ac3672fdf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0ea6a0edc062d44e94779c2aa67ffbeb9a1f04f9283d22e0f1e2742a7d01154b588a727960b727a9ed8f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6077f05613b8d93d8b50ac9cb83a1da6af222874dc0edaf13069623e4fa3ccaf",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf69672897fd035d50e94af67612c9ec62dff4666769477965421cba7ae2b9468",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d12g0v0_EIP158" : {
+    "modexp_d12g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d12g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0xbffc57e0f6a4ed5a92a91a790b4b04d10c407019657511ac98e9ded7c5d34923",
-                    "mixHash" : "0x9d55105bbddd914154028c61e776faf919f8966df805003931c85aea85c156ad",
-                    "nonce" : "0x40b81b4c57d20251",
+                    "hash" : "0xc63f50294e1b9b263e4ddb65d10deb25d0a325d807041740757d7fa70a8a09e3",
+                    "mixHash" : "0xbfa4e4b1f145ef3a01b78b6e9805d9671f45c8fba5146b9398fca9709d3ac7c0",
+                    "nonce" : "0x8b708962f5a534cd",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0bfa4e4b1f145ef3a01b78b6e9805d9671f45c8fba5146b9398fca9709d3ac7c0888b708962f5a534cdf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08",
+                        "s" : "0x758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc63f50294e1b9b263e4ddb65d10deb25d0a325d807041740757d7fa70a8a09e3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d12g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d12g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x8660070fd0bb8f13c7718888a2acb63e888a633cd7a1bed3e2ccc5831385864b",
+                    "mixHash" : "0x6cd98e7bda4e7fd1896ca7a017d1e07b60d7d30c1332122fffc3ee1856030486",
+                    "nonce" : "0xf84a30192e225487",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a09d55105bbddd914154028c61e776faf919f8966df805003931c85aea85c156ad8840b81b4c57d20251f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a06cd98e7bda4e7fd1896ca7a017d1e07b60d7d30c1332122fffc3ee185603048688f84a30192e225487f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbffc57e0f6a4ed5a92a91a790b4b04d10c407019657511ac98e9ded7c5d34923",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8660070fd0bb8f13c7718888a2acb63e888a633cd7a1bed3e2ccc5831385864b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d12g0v0_Frontier" : {
+    "modexp_d12g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d12g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd2e43837f2f342ca0f10923d4647695801b05ce18a83f7d7a6d7daf81e78a951",
-                    "mixHash" : "0x9745c62727e4f757c28ddbcede62a1525bb56d266172dfbfb2347683b2164360",
-                    "nonce" : "0xfebe13fd5f2886d3",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0xc8947d835725df0f1b178d614571375c2e14548b888fef9bccd0a7651ffa1e24",
+                    "mixHash" : "0x9e4c2492bbc94cdad089091544997ea1eccd064c44a48da8420cf97593bf4b02",
+                    "nonce" : "0x8fe35920064fc8bf",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a09745c62727e4f757c28ddbcede62a1525bb56d266172dfbfb2347683b216436088febe13fd5f2886d3f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a09e4c2492bbc94cdad089091544997ea1eccd064c44a48da8420cf97593bf4b02888fe35920064fc8bff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2e43837f2f342ca0f10923d4647695801b05ce18a83f7d7a6d7daf81e78a951",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc8947d835725df0f1b178d614571375c2e14548b888fef9bccd0a7651ffa1e24",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9d3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f462d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d12g0v0_Homestead" : {
+    "modexp_d12g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d12g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x6e64da20178630df85f29d3c026c995ae28455698d7c66dc9ff0491649e80c4e",
-                    "mixHash" : "0x363e78a65a0dc60b495b9867b41da5c9aee7f329bab6507dd1f7e6708e8e19e3",
-                    "nonce" : "0x56b03eeb5f91d955",
+                    "hash" : "0xe15de90d5db071438e9e52b59d67f908a43d22f985f72741a683d117bc5b6574",
+                    "mixHash" : "0xc188edd758143c3d9ba024dcf214e0233193cbb57565bc84395ae37106453ca3",
+                    "nonce" : "0xdfb520af637e34bd",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0363e78a65a0dc60b495b9867b41da5c9aee7f329bab6507dd1f7e6708e8e19e38856b03eeb5f91d955f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0c188edd758143c3d9ba024dcf214e0233193cbb57565bc84395ae37106453ca388dfb520af637e34bdf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e64da20178630df85f29d3c026c995ae28455698d7c66dc9ff0491649e80c4e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe15de90d5db071438e9e52b59d67f908a43d22f985f72741a683d117bc5b6574",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d12g0v0_Metropolis" : {
+    "modexp_d12g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d12g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9d3",
-                    "hash" : "0x4364daf1b275057b3dd7f81f62608f249f369688a61251aafce02fb34a85161b",
-                    "mixHash" : "0x09753cdfac99d059f290ddcd8c400adcca18ce800edc3fcb1e2ef775c6d84f58",
-                    "nonce" : "0xb45dc6a7eee32ef5",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x9da207a72618376da04a4ba5c5b6665b0198611cf7b1215581bc87f16eb926e3",
+                    "mixHash" : "0x20fb72ce1f0bd80f2f0e9937833b68b14dbffc44744bf267fb9ef09ac20b0f99",
+                    "nonce" : "0x153a3d6ac33b420f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
-                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a009753cdfac99d059f290ddcd8c400adcca18ce800edc3fcb1e2ef775c6d84f5888b45dc6a7eee32ef5f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada02307efff069c52043761cde10fb808531e8cde0f0b038f3966ff8f85affe429aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a020fb72ce1f0bd80f2f0e9937833b68b14dbffc44744bf267fb9ef09ac20b0f9988153a3d6ac33b420ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203001ba091d6ac4a1917bf4d1e8a355e113927f7d2d9ab5ed358501ddd90fc9b35347f08a0758daa013fd3590499b3b39604dcbec8973bd15df0da28a633b43da5a71dcc08c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4364daf1b275057b3dd7f81f62608f249f369688a61251aafce02fb34a85161b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9da207a72618376da04a4ba5c5b6665b0198611cf7b1215581bc87f16eb926e3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9d3",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f462d",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json
index 9d1f39c03..cfd0959fb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d13g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d13g0v0_EIP150" : {
+    "modexp_d13g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d13g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x92b57ae0a30eb1e5cafbb6a080a6144d467b5f3176ae35817d7a4187b2ae3608",
-                    "mixHash" : "0x5f2dd41581ba9038da0c6a9de8f84196daf58c910e48fab6d6dec6942181dd9f",
-                    "nonce" : "0x02325807e3f54912",
+                    "hash" : "0xd5e694c7dbb5ef08e785417f10fe0887fda1591bbd3b3d5ea8a880da351effaf",
+                    "mixHash" : "0xd9803e4c34910ae7ad5d0641f90d8a38e6f93e2c7e13fc08e1a46d98edc57a7f",
+                    "nonce" : "0xf494e09db6988d93",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
-                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a05f2dd41581ba9038da0c6a9de8f84196daf58c910e48fab6d6dec6942181dd9f8802325807e3f54912f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0d9803e4c34910ae7ad5d0641f90d8a38e6f93e2c7e13fc08e1a46d98edc57a7f88f494e09db6988d93f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92b57ae0a30eb1e5cafbb6a080a6144d467b5f3176ae35817d7a4187b2ae3608",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd5e694c7dbb5ef08e785417f10fe0887fda1591bbd3b3d5ea8a880da351effaf",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d13g0v0_EIP158" : {
+    "modexp_d13g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d13g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x3a91c9e95f3d465169048b9c1827e4dd42544ea75bea148ca066452811eecfd5",
-                    "mixHash" : "0xbe9a348fd2cc74099ade3d29bc151c13de5d51f699851a27d973b0cc0ce81941",
-                    "nonce" : "0xaf894b290316fb4e",
+                    "hash" : "0x1a6b5cc45dba0c69bf03484e4fb5f105aafddc1114e11156a2917929c0b9f4bb",
+                    "mixHash" : "0xbb02b96802986471f8e7f6d216edb00a8eaa77ed7b28c325d5af457a3b87fd45",
+                    "nonce" : "0x0bf16fa0a320cd4e",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0bb02b96802986471f8e7f6d216edb00a8eaa77ed7b28c325d5af457a3b87fd45880bf16fa0a320cd4ef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddc",
+                        "s" : "0x6c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1a6b5cc45dba0c69bf03484e4fb5f105aafddc1114e11156a2917929c0b9f4bb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d13g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d13g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xbfcbdc5c3635684513d6ae550fd5fcfa479700d5196895b4da0235a694d2a7e8",
+                    "mixHash" : "0x09521af0679621b4883396b2884ce2a514159e6d5dc5eb71e61db37e0827ec58",
+                    "nonce" : "0xe659a8081a703869",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0be9a348fd2cc74099ade3d29bc151c13de5d51f699851a27d973b0cc0ce8194188af894b290316fb4ef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a009521af0679621b4883396b2884ce2a514159e6d5dc5eb71e61db37e0827ec5888e659a8081a703869f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a91c9e95f3d465169048b9c1827e4dd42544ea75bea148ca066452811eecfd5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbfcbdc5c3635684513d6ae550fd5fcfa479700d5196895b4da0235a694d2a7e8",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d13g0v0_Frontier" : {
+    "modexp_d13g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d13g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x94b66899642af6693b2f2b34f669c9e6e1bfd675670a1410b8926dd5a0f50854",
-                    "mixHash" : "0xd7c1ead6a0085370488c04aeea84cbfa04f1729e36767e52fd5a3ec885864117",
-                    "nonce" : "0x166aa1c40b0101fe",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xa2440aed05618799ccda4005b9b63756e16793b126a33d2b67bd0ff631838699",
+                    "mixHash" : "0x25cb1b032ec4dc1c756b3f30710512abc9fef0b56e15a45df079c5de5de6f2cb",
+                    "nonce" : "0xf289c9c6d06639c9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d7c1ead6a0085370488c04aeea84cbfa04f1729e36767e52fd5a3ec88586411788166aa1c40b0101fef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a025cb1b032ec4dc1c756b3f30710512abc9fef0b56e15a45df079c5de5de6f2cb88f289c9c6d06639c9f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94b66899642af6693b2f2b34f669c9e6e1bfd675670a1410b8926dd5a0f50854",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa2440aed05618799ccda4005b9b63756e16793b126a33d2b67bd0ff631838699",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b98f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4671",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d13g0v0_Homestead" : {
+    "modexp_d13g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d13g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x3b32298d9558dd572cf5ce37a1dccc2075f7bf557a054fda9da020ddfe1e060c",
-                    "mixHash" : "0xe3043cc2c7122e049900ec718e16cedab78ffeb8301bcccf81ed87e04cfa99f6",
-                    "nonce" : "0xfc7dd9d15379b388",
+                    "hash" : "0xb3cc6e2c5b8b6b441d60897b9e7e98e8967a27c93a1f90d76d1d4d77ed34d145",
+                    "mixHash" : "0xf6e25b9624e988e79440914894126590fb05f6a2e8e4847acf99b08bfb994588",
+                    "nonce" : "0x19682a877dde59fe",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0e3043cc2c7122e049900ec718e16cedab78ffeb8301bcccf81ed87e04cfa99f688fc7dd9d15379b388f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f6e25b9624e988e79440914894126590fb05f6a2e8e4847acf99b08bfb9945888819682a877dde59fef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b32298d9558dd572cf5ce37a1dccc2075f7bf557a054fda9da020ddfe1e060c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb3cc6e2c5b8b6b441d60897b9e7e98e8967a27c93a1f90d76d1d4d77ed34d145",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d13g0v0_Metropolis" : {
+    "modexp_d13g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d13g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb98f",
-                    "hash" : "0x63ce105a16a1f90cd439ca178c4ab13844da3af7b59249e268862add268b736a",
-                    "mixHash" : "0xcaf8378aef8c6870900f996eff86d46e5e53721f0a7283ab338f2456d4df77e3",
-                    "nonce" : "0x766e89e36f43fa7e",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xb7a3d0eb365b0d6d8f7548c79ea0c720a36ae12f7bbc5bbaef0c09fc54cbe526",
+                    "mixHash" : "0xfa75293481da7e1e86db73aa65e49bd4ab2c2d0c1a3fba433e48a34b9682eaa4",
+                    "nonce" : "0x2238194e7e6115a3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
-                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x50e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0caf8378aef8c6870900f996eff86d46e5e53721f0a7283ab338f2456d4df77e388766e89e36f43fa7ef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada050e2720609b92062784c73b86355c3b3072d36250096048dd7a7ed7be9ba0f67a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0fa75293481da7e1e86db73aa65e49bd4ab2c2d0c1a3fba433e48a34b9682eaa4882238194e7e6115a3f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000103041ca0c63f8b5f7d5e1e3459f59a51f6629ced07fc7187e89a188a79898bce7735bddca06c7af8f8201e61f4be63daf898a716f8cb9f75191d9c0208ca7f6195b58ad966c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63ce105a16a1f90cd439ca178c4ab13844da3af7b59249e268862add268b736a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb7a3d0eb365b0d6d8f7548c79ea0c720a36ae12f7bbc5bbaef0c09fc54cbe526",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b98f",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4671",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json
index c0b98187f..7b5d4ddab 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d14g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d14g0v0_EIP150" : {
+    "modexp_d14g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d14g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb98f",
-                    "hash" : "0xef146145c6b42bb26847a3f97973c86e0c50a38effe4a4646c21a40db5372493",
-                    "mixHash" : "0xaa9d9a4a1752e21324e9ab58c660787e550e396bb31c69744dcbbfe289810e00",
-                    "nonce" : "0xcf6600faaaf8823c",
+                    "gasUsed" : "0xf427",
+                    "hash" : "0xc0001790478a5d6bbfa0257f572ac0b169adfba54cd8e1b798d043584204c580",
+                    "mixHash" : "0xe14f489c3e570ba463e06cccf44b9d4f20afba146f9a4e14cac10ff68d662f86",
+                    "nonce" : "0xdd48cfd1065e61cf",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
-                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
+                    "stateRoot" : "0xf25eb135a47134fe0585e519127c1e23195a14a7476be1534875cdb3b0e09cfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0aa9d9a4a1752e21324e9ab58c660787e550e396bb31c69744dcbbfe289810e0088cf6600faaaf8823cf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f25eb135a47134fe0585e519127c1e23195a14a7476be1534875cdb3b0e09cfaa039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a0e14f489c3e570ba463e06cccf44b9d4f20afba146f9a4e14cac10ff68d662f8688dd48cfd1065e61cff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef146145c6b42bb26847a3f97973c86e0c50a38effe4a4646c21a40db5372493",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc0001790478a5d6bbfa0257f572ac0b169adfba54cd8e1b798d043584204c580",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b98f",
+                "balance" : "0x4563918244f4f427",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4671",
+                "balance" : "0x3635c9adc5de9f0bd9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d14g0v0_EIP158" : {
+    "modexp_d14g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d14g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf427",
+                    "hash" : "0x3b78248dac900222adfe1198711d8a72994e42691df3de7ea727628f22b4dcd9",
+                    "mixHash" : "0x3afb9f328350c4317fdd348f1d1fc421eda84d7c45a8f816043f7110d4afc755",
+                    "nonce" : "0xf214f33757dc1702",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
+                    "stateRoot" : "0xf25eb135a47134fe0585e519127c1e23195a14a7476be1534875cdb3b0e09cfa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f25eb135a47134fe0585e519127c1e23195a14a7476be1534875cdb3b0e09cfaa039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a03afb9f328350c4317fdd348f1d1fc421eda84d7c45a8f816043f7110d4afc75588f214f33757dc1702f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33",
+                        "s" : "0x72950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3b78248dac900222adfe1198711d8a72994e42691df3de7ea727628f22b4dcd9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f427",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d14g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d14g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0xf73338a546f98981ed44d72c7823468d1958cf5f9fc72dd57e30509d5ea532ad",
-                    "mixHash" : "0xbe4bc6afacba77e5e2f9ddca4f4dc35f342b437e8461db81bbc19efec6a8ccf4",
-                    "nonce" : "0xc49292389c64a291",
+                    "hash" : "0x5f149cba83eb62032631a10ad3c2142b6d45e566da34bf62ae6dd768e03c2953",
+                    "mixHash" : "0x8be3967e9e7a78b17637822bc9f61ff5a56f27bda161cda8a46cb00066469c9a",
+                    "nonce" : "0x4d4f6269e0e69a29",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0be4bc6afacba77e5e2f9ddca4f4dc35f342b437e8461db81bbc19efec6a8ccf488c49292389c64a291f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a08be3967e9e7a78b17637822bc9f61ff5a56f27bda161cda8a46cb00066469c9a884d4f6269e0e69a29f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf73338a546f98981ed44d72c7823468d1958cf5f9fc72dd57e30509d5ea532ad",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5f149cba83eb62032631a10ad3c2142b6d45e566da34bf62ae6dd768e03c2953",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d14g0v0_Frontier" : {
+    "modexp_d14g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d14g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x66bca2e16741d888ff0ef5ceaadb2deb721cc06c5fda5e55e4efbe1ec4034a2b",
-                    "mixHash" : "0xb2ef5c5f1fc04d68272714bffa54ca2ff3b8214a1cfdb1e8ac55debaee7f3f83",
-                    "nonce" : "0xb6174bd5d9a7ab77",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x1c5932f9ab803a442e10675f090ced97831e132c6a8035be87d490af59703fb7",
+                    "mixHash" : "0xf9ff0478d1652f8beffb4eba5a4eff44e8b64b79b761b8ac8c3967759c60dc20",
+                    "nonce" : "0xbd8fcfa12be8629b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b2ef5c5f1fc04d68272714bffa54ca2ff3b8214a1cfdb1e8ac55debaee7f3f8388b6174bd5d9a7ab77f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0f9ff0478d1652f8beffb4eba5a4eff44e8b64b79b761b8ac8c3967759c60dc2088bd8fcfa12be8629bf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66bca2e16741d888ff0ef5ceaadb2deb721cc06c5fda5e55e4efbe1ec4034a2b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1c5932f9ab803a442e10675f090ced97831e132c6a8035be87d490af59703fb7",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b98f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4671",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d14g0v0_Homestead" : {
+    "modexp_d14g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d14g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x32f294144c19f8b3ea7a66886a05ddccb4599e9a8560db14a73b6da32bb87be9",
-                    "mixHash" : "0x164d2259d012814b6bd4b0a35a5d66a0393d303ddc4f85bb7e5a3b4d6ec85b2c",
-                    "nonce" : "0xca2332708f6914e5",
+                    "hash" : "0x32d225ab1f1c1d1e114de31c80ee068f494f1f98c7724c2372dda4911883246f",
+                    "mixHash" : "0x3ad02fee73188120862d0cc4ba410f1539cadae7b545da5a6e93eaa543c02d00",
+                    "nonce" : "0xd3c5eb0e1f28cb6f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0164d2259d012814b6bd4b0a35a5d66a0393d303ddc4f85bb7e5a3b4d6ec85b2c88ca2332708f6914e5f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a03ad02fee73188120862d0cc4ba410f1539cadae7b545da5a6e93eaa543c02d0088d3c5eb0e1f28cb6ff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32f294144c19f8b3ea7a66886a05ddccb4599e9a8560db14a73b6da32bb87be9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x32d225ab1f1c1d1e114de31c80ee068f494f1f98c7724c2372dda4911883246f",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d14g0v0_Metropolis" : {
+    "modexp_d14g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d14g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf427",
-                    "hash" : "0x5c170f30400e348e4e481db3470cf173225965042740159738ba54fd98a3a792",
-                    "mixHash" : "0x2674d8f41dc6ebf36d46aa1ef5aecbd5f4c613a014c0a696b0581300d1d0df3a",
-                    "nonce" : "0xf0bd5291ba594fc4",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x9db8720e2520b732b5acb39fcf974667bf9f934cacc0e3ae77a71cfe7af7f1fa",
+                    "mixHash" : "0x13fcc0b6159e02e55e43fdce43e5ddbbaee04d1eb0d47e2eb03abcdffdd9f30c",
+                    "nonce" : "0x38d95022cada917f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x1d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44a",
-                    "stateRoot" : "0xf25eb135a47134fe0585e519127c1e23195a14a7476be1534875cdb3b0e09cfa",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f25eb135a47134fe0585e519127c1e23195a14a7476be1534875cdb3b0e09cfaa039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a01d71e45e8328d053fa750edf1fc09480b7333b1a6c242db8fd120a527383e44ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4278203e880a02674d8f41dc6ebf36d46aa1ef5aecbd5f4c613a014c0a696b0581300d1d0df3a88f0bd5291ba594fc4f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada039bbb90f4eba6a03f1a9b3ba2a085b7f1a46e3c38696bab916e3120fd537ad49a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a013fcc0b6159e02e55e43fdce43e5ddbbaee04d1eb0d47e2eb03abcdffdd9f30c8838d95022cada917ff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102041ca0935fbe0bfd2fdb48bdddea87d7f9bdbdeb4cc39ba48873c27eb15b32afed0e33a072950bb7403880cab0413a479701957c24a301b788731c26a8cb95600cc79e4cc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c170f30400e348e4e481db3470cf173225965042740159738ba54fd98a3a792",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9db8720e2520b732b5acb39fcf974667bf9f934cacc0e3ae77a71cfe7af7f1fa",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f427",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0bd9",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json
index 88974b3ec..5b43e94ba 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d15g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d15g0v0_EIP150" : {
+    "modexp_d15g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d15g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0xf9d04cf406d3d72d0b927948727c9232e351d67720b81f363bfb3a8ae7bcd4f3",
-                    "mixHash" : "0xadf4f007016a39c5c637c54f3cb0f114c4e00e2327a1cc39ab52070249a798e1",
-                    "nonce" : "0xf998ac1f985ce8a6",
+                    "hash" : "0x3390ee88cd91edb0aeeab5dd13f3955809bdd90f457de56ee8c1db28d8a3aafa",
+                    "mixHash" : "0x4fe6a2e5050e80fafa6828e1164330c2ed4213aa50b4f929590e5cf0ee2f9e9a",
+                    "nonce" : "0x74f07c58afc0c216",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
-                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0adf4f007016a39c5c637c54f3cb0f114c4e00e2327a1cc39ab52070249a798e188f998ac1f985ce8a6f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a04fe6a2e5050e80fafa6828e1164330c2ed4213aa50b4f929590e5cf0ee2f9e9a8874f07c58afc0c216f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9d04cf406d3d72d0b927948727c9232e351d67720b81f363bfb3a8ae7bcd4f3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3390ee88cd91edb0aeeab5dd13f3955809bdd90f457de56ee8c1db28d8a3aafa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d15g0v0_EIP158" : {
+    "modexp_d15g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d15g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x313df9fbe4cf88266d51b0cce8662ad09b1ff6d5950b763aff5841705c314cef",
-                    "mixHash" : "0xa8c6518f50a29a356645402931239c6c33b204d77aad76b541d1cda2da5d12e5",
-                    "nonce" : "0xc20ec0af4acb8b6e",
+                    "hash" : "0x24c74906f03016b9d5fae7473d4a7cbc9abe75ad78e8ae25d728394b7fce36f9",
+                    "mixHash" : "0xea1783f5133a790667bb332aa6bdaaa8925968ea4e05251eeb87172a507c35a9",
+                    "nonce" : "0xbe4d2923011806c1",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0ea1783f5133a790667bb332aa6bdaaa8925968ea4e05251eeb87172a507c35a988be4d2923011806c1f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987",
+                        "s" : "0x63acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adca",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x24c74906f03016b9d5fae7473d4a7cbc9abe75ad78e8ae25d728394b7fce36f9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d15g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d15g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xa728c972f23c43cbfd5a0bd70b7f00d196c24383cd24d52399d4673b9ba5d096",
+                    "mixHash" : "0x5c13afe67fbe882cb63044c345c7055cc197b879c78c6d460c949e590eda6ba3",
+                    "nonce" : "0x0c84aa9e40f97a32",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0a8c6518f50a29a356645402931239c6c33b204d77aad76b541d1cda2da5d12e588c20ec0af4acb8b6ef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a05c13afe67fbe882cb63044c345c7055cc197b879c78c6d460c949e590eda6ba3880c84aa9e40f97a32f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x313df9fbe4cf88266d51b0cce8662ad09b1ff6d5950b763aff5841705c314cef",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa728c972f23c43cbfd5a0bd70b7f00d196c24383cd24d52399d4673b9ba5d096",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d15g0v0_Frontier" : {
+    "modexp_d15g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d15g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x183899e21937837cb238746cb2dcd249a455fc9f8954b25438b792d460d41739",
-                    "mixHash" : "0x62cad8242bd75343149444cba9994e570af2a59a96238db97989e3f62508bc1b",
-                    "nonce" : "0x892a6f95c230c6da",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x9b514b5ba9a6aeb532dc7ad403f4370544152629253e9cd17343b1d4ad6600c3",
+                    "mixHash" : "0x99aa4c86a562db972ee2f87cc052162fd09be1c59924ee098c299c6eceaa8f49",
+                    "nonce" : "0xb87797c833e8e7e5",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a062cad8242bd75343149444cba9994e570af2a59a96238db97989e3f62508bc1b88892a6f95c230c6daf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a099aa4c86a562db972ee2f87cc052162fd09be1c59924ee098c299c6eceaa8f4988b87797c833e8e7e5f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x183899e21937837cb238746cb2dcd249a455fc9f8954b25438b792d460d41739",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9b514b5ba9a6aeb532dc7ad403f4370544152629253e9cd17343b1d4ad6600c3",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b98f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4671",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d15g0v0_Homestead" : {
+    "modexp_d15g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d15g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x87ee2f040ed6149d4f3488bf2e9dc46fe0456d14b3380e39fe456baf9d9db3c8",
-                    "mixHash" : "0x871c1c0665ac1a08b7a3e92a142bd011e43cb6bb3ab716e14aa2519dbcd2e02b",
-                    "nonce" : "0xb7d98711aa0007a7",
+                    "hash" : "0x536c5386ef80faf2a8e12e060f5c24fde3d8fd6450bccfdce933db01eea7600b",
+                    "mixHash" : "0x27fbce5ff028df5b2c512569f431a85e7f4a5ebb6a8253e1205567460d981239",
+                    "nonce" : "0x5a3f3c8c46139638",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0871c1c0665ac1a08b7a3e92a142bd011e43cb6bb3ab716e14aa2519dbcd2e02b88b7d98711aa0007a7f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a027fbce5ff028df5b2c512569f431a85e7f4a5ebb6a8253e1205567460d981239885a3f3c8c46139638f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87ee2f040ed6149d4f3488bf2e9dc46fe0456d14b3380e39fe456baf9d9db3c8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x536c5386ef80faf2a8e12e060f5c24fde3d8fd6450bccfdce933db01eea7600b",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d15g0v0_Metropolis" : {
+    "modexp_d15g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d15g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb98f",
-                    "hash" : "0x1d0e862af079beaa12c1901d1beb92cb36b21682e123a1c71de1a012c0634d02",
-                    "mixHash" : "0xcf4ed671f28ef5223734047285715e352cb175bd280577f0f72a9605586444d4",
-                    "nonce" : "0xf5571f98375a8db7",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x445638af6ed95fa4ca4b616aace504b4e4d2c935c7b6f3f3eae101d1a133dba4",
+                    "mixHash" : "0x2351086ac8a3a0837ec798b9af1b28d4fc10474dec87cfa23eab2cf2f40eb644",
+                    "nonce" : "0x54d44cb6f4f49ecf",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
-                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x54d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0cf4ed671f28ef5223734047285715e352cb175bd280577f0f72a9605586444d488f5571f98375a8db7f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada054d4b64517de294b22787f27c348cad61d3ff4880f58afc2d075efaae8e3f36aa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a02351086ac8a3a0837ec798b9af1b28d4fc10474dec87cfa23eab2cf2f40eb6448854d44cb6f4f49ecff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002031ba091df3d008f238890dd852fc9b397c9a9927865f6cb98be9b58f359d4de569987a063acf84b4e6359d5a9f69c2936e9d7d9c652b1c5e710be91849915fe4920adcac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d0e862af079beaa12c1901d1beb92cb36b21682e123a1c71de1a012c0634d02",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x445638af6ed95fa4ca4b616aace504b4e4d2c935c7b6f3f3eae101d1a133dba4",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b98f",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4671",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json
index f6ecde2aa..144a49365 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d16g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d16g0v0_EIP150" : {
+    "modexp_d16g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d16g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xba17",
-                    "hash" : "0xa740d9c308546084de8698e14e02f2c9407926228b4f6b3f23c4398fee35d7e6",
-                    "mixHash" : "0x169a97b30933108190313360e38d31101851242a0a59ace4316015816cdd3bdf",
-                    "nonce" : "0xd23f2cb27a07e6da",
+                    "gasUsed" : "0xf4af",
+                    "hash" : "0xf7a41fd0582e3f31a1b9ccf75fb90b9fdc0ea851b2cb3318c7d4f5afe82bc565",
+                    "mixHash" : "0x82c66d75faa0acbe28fde6716b60ee09652ae4eba5066daebb85694d9601ad34",
+                    "nonce" : "0x71c1bc7534bccc30",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
-                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
+                    "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
+                    "stateRoot" : "0x468ea0ddf6291f4b683f2361e55205d25d47967316bdcf0bcca486791b208c29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a0169a97b30933108190313360e38d31101851242a0a59ace4316015816cdd3bdf88d23f2cb27a07e6daf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0468ea0ddf6291f4b683f2361e55205d25d47967316bdcf0bcca486791b208c29a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a082c66d75faa0acbe28fde6716b60ee09652ae4eba5066daebb85694d9601ad348871c1bc7534bccc30f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa740d9c308546084de8698e14e02f2c9407926228b4f6b3f23c4398fee35d7e6",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf7a41fd0582e3f31a1b9ccf75fb90b9fdc0ea851b2cb3318c7d4f5afe82bc565",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba17",
+                "balance" : "0x4563918244f4f4af",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f45e9",
+                "balance" : "0x3635c9adc5de9f0b51",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d16g0v0_EIP158" : {
+    "modexp_d16g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d16g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4af",
+                    "hash" : "0x78e1fec360a5d6752b67ddc3ffa0493e1b74fc1dabbcf7171c6e8f57548f1605",
+                    "mixHash" : "0x369e3d2edb62f4025dca9f27ff10ff210bcdf00ca5d9fed98648fd13f0227e46",
+                    "nonce" : "0x3147dac83c677e66",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
+                    "stateRoot" : "0x468ea0ddf6291f4b683f2361e55205d25d47967316bdcf0bcca486791b208c29",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0468ea0ddf6291f4b683f2361e55205d25d47967316bdcf0bcca486791b208c29a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a0369e3d2edb62f4025dca9f27ff10ff210bcdf00ca5d9fed98648fd13f0227e46883147dac83c677e66f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437",
+                        "s" : "0x4109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x78e1fec360a5d6752b67ddc3ffa0493e1b74fc1dabbcf7171c6e8f57548f1605",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f4af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b51",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d16g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d16g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba17",
-                    "hash" : "0x766e0e1d83893d36f022d56730007eb8af08c52023359e3f02dad8580ccf455b",
-                    "mixHash" : "0xebc54ab0ec2eaf2e279a15d60b0589eabe4d8ac2e3a39f35433f716b3d1d4567",
-                    "nonce" : "0x14880df74edef9cf",
+                    "hash" : "0x636a4c733ee672c27e94c6bafa8de9e9d3d656aa1bdc3752e0f1f42c6835e64e",
+                    "mixHash" : "0x3f69f1cbb4e103c28e5e0af2d0785d369a9743b1dfb9c6678118cc96b63054e0",
+                    "nonce" : "0x5220aba0803a8ac8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a0ebc54ab0ec2eaf2e279a15d60b0589eabe4d8ac2e3a39f35433f716b3d1d45678814880df74edef9cff8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a03f69f1cbb4e103c28e5e0af2d0785d369a9743b1dfb9c6678118cc96b63054e0885220aba0803a8ac8f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x766e0e1d83893d36f022d56730007eb8af08c52023359e3f02dad8580ccf455b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x636a4c733ee672c27e94c6bafa8de9e9d3d656aa1bdc3752e0f1f42c6835e64e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d16g0v0_Frontier" : {
+    "modexp_d16g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d16g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x08be2b249f99212a2f1f1b88fae3d82588d18a96dbcf2412eb0693c250444eb1",
-                    "mixHash" : "0x8569c655ba40e679dbe9c01f2e1b37128ff688324c6f70e3381d6714f27ea201",
-                    "nonce" : "0xb5cf5153054002a1",
+                    "gasUsed" : "0xba17",
+                    "hash" : "0x7336c96726e8b168263fb509135000c53a314abb3dcedb8a2866720bd438ec21",
+                    "mixHash" : "0x188aa77e4f653123d49b5c4794f9fbadc9e27a9db5c54a9a6d1933c4c45fb65a",
+                    "nonce" : "0x20db7fb59f1d10e1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x8341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71",
+                    "stateRoot" : "0x3654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a08569c655ba40e679dbe9c01f2e1b37128ff688324c6f70e3381d6714f27ea20188b5cf5153054002a1f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03654989f29451551c530c60d2668f158ee75a487dd0ab30dfc3a696bd248ba67a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08341316329073e46e71ec9ae3303968a7a961dfab1c18a57e9b82be86759da71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba178203e880a0188aa77e4f653123d49b5c4794f9fbadc9e27a9db5c54a9a6d1933c4c45fb65a8820db7fb59f1d10e1f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08be2b249f99212a2f1f1b88fae3d82588d18a96dbcf2412eb0693c250444eb1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7336c96726e8b168263fb509135000c53a314abb3dcedb8a2866720bd438ec21",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ba17",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f45e9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d16g0v0_Homestead" : {
+    "modexp_d16g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d16g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x6669005ffaf6c84f5bb00bbabfed1e382a91e89d50fa7c36154e6cf83892b446",
-                    "mixHash" : "0x1c713b40ff5912764712632716f7cc890d864479913d4223cf3fc0a915184631",
-                    "nonce" : "0xc8e673bb9a81e558",
+                    "hash" : "0xc9f3f3c33a4924bbf311cac9790db5cb38adb899a7cee5cf3ab97ee34a2fc6a4",
+                    "mixHash" : "0xb6785bd38cb4ae03e3c21422f476d07de7a62fa4ffb37136147766564aea80b3",
+                    "nonce" : "0xf7535d2e0a0ac47a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a01c713b40ff5912764712632716f7cc890d864479913d4223cf3fc0a91518463188c8e673bb9a81e558f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b6785bd38cb4ae03e3c21422f476d07de7a62fa4ffb37136147766564aea80b388f7535d2e0a0ac47af8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6669005ffaf6c84f5bb00bbabfed1e382a91e89d50fa7c36154e6cf83892b446",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc9f3f3c33a4924bbf311cac9790db5cb38adb899a7cee5cf3ab97ee34a2fc6a4",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d16g0v0_Metropolis" : {
+    "modexp_d16g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d16g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf4af",
-                    "hash" : "0xdea7a404a16fe3045388080b1260a9be213ab195f429a23473873dc5715e60e7",
-                    "mixHash" : "0x33f1cae0d79e5677adde394e01b4bf0cc98ddc53b64535d39bf856e283f69d46",
-                    "nonce" : "0xb324e42ae98c8718",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x7e725925e9f97f219cb30221ea35ce3ea61f9687f4118c20de74ffd5a51bb7bd",
+                    "mixHash" : "0xfe6ea49747b18cc984d687c47998129f6d35d0a4f8c8a45537019a052ac48b58",
+                    "nonce" : "0x34ae3c3b94725817",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97",
-                    "stateRoot" : "0x468ea0ddf6291f4b683f2361e55205d25d47967316bdcf0bcca486791b208c29",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0468ea0ddf6291f4b683f2361e55205d25d47967316bdcf0bcca486791b208c29a0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a0510427ec9203e63cec9cdfb3c726f83e65bdfb5be4883b0ec012991a0242cc97b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4af8203e880a033f1cae0d79e5677adde394e01b4bf0cc98ddc53b64535d39bf856e283f69d4688b324e42ae98c8718f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
+                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0669dc8b979df559f38bc885b1170b6ea4ac758197d195efef8ab7713a6682343a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0fe6ea49747b18cc984d687c47998129f6d35d0a4f8c8a45537019a052ac48b588834ae3c3b94725817f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300061ba0f6348eb978e3af5d693d74763946c7b820c1d8e7eb9074813dc04738f4916437a04109bb14a67e2e89de0d45a9e25b8357ddceefd6fc2d0510011662ed786cf2d9c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdea7a404a16fe3045388080b1260a9be213ab195f429a23473873dc5715e60e7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7e725925e9f97f219cb30221ea35ce3ea61f9687f4118c20de74ffd5a51bb7bd",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f4af",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0b51",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json
index ffa4e596b..1a477fde2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d17g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d17g0v0_EIP150" : {
+    "modexp_d17g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d17g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xba13",
-                    "hash" : "0xc4664247319ffb89e8fe19b409fd6fb0285e8549976cf8d44ee0aca0ff2774bc",
-                    "mixHash" : "0xbc5b2cb0450890b4f34b473299429b893c75671cf7283bb901954c9e6947a6e4",
-                    "nonce" : "0x379e3f32e2a72f27",
+                    "gasUsed" : "0xf4ab",
+                    "hash" : "0x094dfe4bfadcaa3cccc47f299b2a01d43f91fb3d3925706e63f4b392a007d24d",
+                    "mixHash" : "0xdd87f963410ad6c56f314d895752bdd0f2e5fed762b33929ea00bf355a019b7f",
+                    "nonce" : "0xbed0faa6928bd687",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
-                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
+                    "stateRoot" : "0xc60422b21403699b8bfb10c037f032ee4e75e1cb9a5850092688c4fb608519d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0bc5b2cb0450890b4f34b473299429b893c75671cf7283bb901954c9e6947a6e488379e3f32e2a72f27f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c60422b21403699b8bfb10c037f032ee4e75e1cb9a5850092688c4fb608519d6a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a0dd87f963410ad6c56f314d895752bdd0f2e5fed762b33929ea00bf355a019b7f88bed0faa6928bd687f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4664247319ffb89e8fe19b409fd6fb0285e8549976cf8d44ee0aca0ff2774bc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x094dfe4bfadcaa3cccc47f299b2a01d43f91fb3d3925706e63f4b392a007d24d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba13",
+                "balance" : "0x4563918244f4f4ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f45ed",
+                "balance" : "0x3635c9adc5de9f0b55",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d17g0v0_EIP158" : {
+    "modexp_d17g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d17g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4ab",
+                    "hash" : "0x06525f53fbabe57629acf567ef389e6dd54bb5d0fa99cb3004e4bff2bd61bb2e",
+                    "mixHash" : "0xb17b405eda70b911f48c439d8ad7fb6cd0960bf1f6c28105130db79f4b4ef44a",
+                    "nonce" : "0xf6f83ceb6c7581bb",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
+                    "stateRoot" : "0xc60422b21403699b8bfb10c037f032ee4e75e1cb9a5850092688c4fb608519d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c60422b21403699b8bfb10c037f032ee4e75e1cb9a5850092688c4fb608519d6a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a0b17b405eda70b911f48c439d8ad7fb6cd0960bf1f6c28105130db79f4b4ef44a88f6f83ceb6c7581bbf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339",
+                        "s" : "0x59fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x06525f53fbabe57629acf567ef389e6dd54bb5d0fa99cb3004e4bff2bd61bb2e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f4ab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b55",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d17g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d17g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0x63d5643376fe26192df53994be9ae6efcce7a631f78a0f7066cc73bbc2af6edf",
-                    "mixHash" : "0xf65ab7813c363570a6b11bd4468b63ed170c1df28f4bc62242d5e0c145cab091",
-                    "nonce" : "0xd52131610b3c2132",
+                    "hash" : "0x4c7791e011562927578c149c5661661019d1e7505a21ca4b037998628386e989",
+                    "mixHash" : "0xfb7f29b6c1110266e7a107bc9023d089a04646c9722454c14c46d2a0c02e6e1f",
+                    "nonce" : "0x9f6f9e83e7059b88",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0f65ab7813c363570a6b11bd4468b63ed170c1df28f4bc62242d5e0c145cab09188d52131610b3c2132f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0fb7f29b6c1110266e7a107bc9023d089a04646c9722454c14c46d2a0c02e6e1f889f6f9e83e7059b88f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63d5643376fe26192df53994be9ae6efcce7a631f78a0f7066cc73bbc2af6edf",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4c7791e011562927578c149c5661661019d1e7505a21ca4b037998628386e989",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d17g0v0_Frontier" : {
+    "modexp_d17g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d17g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xa578e91c7687088bd6aaebe75f2e65c07bd0f68558d4c0b76679eb5b667b3316",
-                    "mixHash" : "0x50282d77ab797f9b93d0f3f1e04c0b986aa8bf4b28d68c86621a0a93876fa5f1",
-                    "nonce" : "0x1fc9809864a4b950",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x4977761af29410f0ad75015a328ec71a3b2bc5ae4002726277a24acbc707aeac",
+                    "mixHash" : "0xf85cbb99ee6a5e10aff00e525920ce8ce239476340d50c41dbb29ebf5456c4bf",
+                    "nonce" : "0x1902f9568e7879ff",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a050282d77ab797f9b93d0f3f1e04c0b986aa8bf4b28d68c86621a0a93876fa5f1881fc9809864a4b950f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0f85cbb99ee6a5e10aff00e525920ce8ce239476340d50c41dbb29ebf5456c4bf881902f9568e7879fff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa578e91c7687088bd6aaebe75f2e65c07bd0f68558d4c0b76679eb5b667b3316",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4977761af29410f0ad75015a328ec71a3b2bc5ae4002726277a24acbc707aeac",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ba13",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f45ed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d17g0v0_Homestead" : {
+    "modexp_d17g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d17g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x547587a34982548f60cb062326de2286bd8404b680ec121babde801acbe6eed7",
-                    "mixHash" : "0xe96361fcf4e496762115b01887942f1ec8b7c6e99e67dc898580137536bf74f3",
-                    "nonce" : "0xbe13ae8a7e5590ff",
+                    "hash" : "0xac180b01f73cf9972fe1344835778e2f98643510c512ce64a7ee4998113c9a12",
+                    "mixHash" : "0x807be67a57b714e2d878d0ef416f6fe424594733baaf891477cde7a5b06c5321",
+                    "nonce" : "0x89077cf16c1813bc",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0e96361fcf4e496762115b01887942f1ec8b7c6e99e67dc898580137536bf74f388be13ae8a7e5590fff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0807be67a57b714e2d878d0ef416f6fe424594733baaf891477cde7a5b06c53218889077cf16c1813bcf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x547587a34982548f60cb062326de2286bd8404b680ec121babde801acbe6eed7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xac180b01f73cf9972fe1344835778e2f98643510c512ce64a7ee4998113c9a12",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d17g0v0_Metropolis" : {
+    "modexp_d17g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d17g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf4ab",
-                    "hash" : "0x17e1a8139102cacba5cda23f35f286f0239f20c163037752ca91ee0d8e5c7c35",
-                    "mixHash" : "0x1fd931765a98730cd4c250b6d597d00720ed6ab068bd811b8a2db0b630536ace",
-                    "nonce" : "0xbd262ea8c5f370aa",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x9720beaa2125c7616ff775b8961d093cfa79a25ec2412039cc3ff99a681a6eaf",
+                    "mixHash" : "0x445072e967a71f7e95b338ce1ff606f2d4f011da79031fe94b4ee18e3e73d169",
+                    "nonce" : "0xe1f32c02182fe05e",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x5ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9",
-                    "stateRoot" : "0xc60422b21403699b8bfb10c037f032ee4e75e1cb9a5850092688c4fb608519d6",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c60422b21403699b8bfb10c037f032ee4e75e1cb9a5850092688c4fb608519d6a0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a05ae4a8fdb97f548157a17a06af567dad59cbc6321651c09ab707c9a74c17ebc9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4ab8203e880a01fd931765a98730cd4c250b6d597d00720ed6ab068bd811b8a2db0b630536ace88bd262ea8c5f370aaf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f17896ecba716a51cb8eab11c83e2b6c5b7f610c5528caba9991276c5fdce080a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0445072e967a71f7e95b338ce1ff606f2d4f011da79031fe94b4ee18e3e73d16988e1f32c02182fe05ef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010203061ca043c46823137cf3565913c93574607efd52b2ebe4806965e2a88777bb846a1339a059fa8b39c5ba4136e7bb8271c2692854256ce956f5155581ad2066ec0b1555c5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17e1a8139102cacba5cda23f35f286f0239f20c163037752ca91ee0d8e5c7c35",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9720beaa2125c7616ff775b8961d093cfa79a25ec2412039cc3ff99a681a6eaf",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f4ab",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0b55",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json
index 44032a6bc..92310afe2 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d18g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d18g0v0_EIP150" : {
+    "modexp_d18g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d18g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x1408cbb3799170195dd447781446423474909b91457717928f5e6f28e50b7925",
-                    "mixHash" : "0xf967094aef347c20e0592f7084e0a87eaa3c8436fd5e05019160375785f69332",
-                    "nonce" : "0x36e40163cc286bd1",
+                    "hash" : "0x0b8e67b7fff85b5f595e200f051b391936eff3a27acde0c09665871d9a37e5f6",
+                    "mixHash" : "0x8473f9256919a31e18a0e5245b66df29693b47fc8aeadb02e56cf1f9d2cd8a1a",
+                    "nonce" : "0xd1a7571d81f18bb9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
-                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0f967094aef347c20e0592f7084e0a87eaa3c8436fd5e05019160375785f693328836e40163cc286bd1f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a08473f9256919a31e18a0e5245b66df29693b47fc8aeadb02e56cf1f9d2cd8a1a88d1a7571d81f18bb9f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1408cbb3799170195dd447781446423474909b91457717928f5e6f28e50b7925",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0b8e67b7fff85b5f595e200f051b391936eff3a27acde0c09665871d9a37e5f6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d18g0v0_EIP158" : {
+    "modexp_d18g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d18g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d3",
-                    "hash" : "0x6e0cc39d6cebc459e68262994d8cb485b1ab2f18d5b85da445d572f83664f022",
-                    "mixHash" : "0xa88f95c9e62f244318558b4327295b4b09df6233655fdb256df5d33643b7ec80",
-                    "nonce" : "0x85b089cfa215f90b",
+                    "hash" : "0xe5adc1952afcbe40637111bad334da4f4eea50a85d2cfb00919f86b402104c8a",
+                    "mixHash" : "0xb2ac304fce7f8c6f45055411473d6da27cda0108c9fa14ba298b9694ad4e796d",
+                    "nonce" : "0x1e2ffa395613511a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
+                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0b2ac304fce7f8c6f45055411473d6da27cda0108c9fa14ba298b9694ad4e796d881e2ffa395613511af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028",
+                        "s" : "0x3decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe5adc1952afcbe40637111bad334da4f4eea50a85d2cfb00919f86b402104c8a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f462d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d18g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d18g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x7deb2240e281f5a4f1a6feb431c5718bba5e8959b827dd18b99d88bc42ba0ba8",
+                    "mixHash" : "0x18fa2e07eb3e8ff5d40fedace70081f57efc373c5c66d4629479929ad8de5ad1",
+                    "nonce" : "0xaaf80a763e151150",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a0a88f95c9e62f244318558b4327295b4b09df6233655fdb256df5d33643b7ec808885b089cfa215f90bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a018fa2e07eb3e8ff5d40fedace70081f57efc373c5c66d4629479929ad8de5ad188aaf80a763e151150f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e0cc39d6cebc459e68262994d8cb485b1ab2f18d5b85da445d572f83664f022",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7deb2240e281f5a4f1a6feb431c5718bba5e8959b827dd18b99d88bc42ba0ba8",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d18g0v0_Frontier" : {
+    "modexp_d18g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d18g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xcfc5f4355aa844ce185496752ffcf21323a7379d15b034d5776e48b947aead41",
-                    "mixHash" : "0x372dfdd9bb989aa72827b8eb4f87c136708ae9e275c49ac7871c1022540c64f0",
-                    "nonce" : "0xb4634cab3ed26d10",
+                    "gasUsed" : "0xb9d3",
+                    "hash" : "0x5511286ebad1f9bf8b6a4da987441397a95676e937038cc07d22b97d8711bb6e",
+                    "mixHash" : "0x55493d6d564cd0bf43fd9c40a075d5e9f23242c490a82cce10498139015c8b29",
+                    "nonce" : "0x088a11da977ecb1f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83df",
+                    "stateRoot" : "0x2c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0372dfdd9bb989aa72827b8eb4f87c136708ae9e275c49ac7871c1022540c64f088b4634cab3ed26d10f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c32e61701383faa3e439268fbd2a4aacdd140fe280a6d35f252e63a851b05b6a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a0911513d533cf50d16a0e79a9d08443e4a5b4dd928618d8f4dca6bbe02d9e83dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a055493d6d564cd0bf43fd9c40a075d5e9f23242c490a82cce10498139015c8b2988088a11da977ecb1ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfc5f4355aa844ce185496752ffcf21323a7379d15b034d5776e48b947aead41",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5511286ebad1f9bf8b6a4da987441397a95676e937038cc07d22b97d8711bb6e",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9d3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f462d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d18g0v0_Homestead" : {
+    "modexp_d18g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d18g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xfa3a6f1ea93055a950235e4c3029edf90b8b6c3e64e4a2230c97e4040304e96c",
-                    "mixHash" : "0xbacfe09b6455de80a9ffd67802df93450aaaef56b5ae2604a30f003bac85f52c",
-                    "nonce" : "0x447d4cf2ddd10986",
+                    "hash" : "0x0db1aeba9d821bb7d9d9d2c7711ca88333b53e6f1213b78c9eb7b497fdde9da9",
+                    "mixHash" : "0x0ec5aa666ef7e5589b599aa6458de8c59eedf5903526bd111d06314ea7756b01",
+                    "nonce" : "0xa6bba630885e3b7d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0bacfe09b6455de80a9ffd67802df93450aaaef56b5ae2604a30f003bac85f52c88447d4cf2ddd10986f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a00ec5aa666ef7e5589b599aa6458de8c59eedf5903526bd111d06314ea7756b0188a6bba630885e3b7df8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa3a6f1ea93055a950235e4c3029edf90b8b6c3e64e4a2230c97e4040304e96c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0db1aeba9d821bb7d9d9d2c7711ca88333b53e6f1213b78c9eb7b497fdde9da9",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d18g0v0_Metropolis" : {
+    "modexp_d18g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d18g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9d3",
-                    "hash" : "0x4242ee9115425c79311fb5acf3ee857b373d0fd44a74260bf0e25679c16f93c7",
-                    "mixHash" : "0x62343e721ae73d40b6503af79792bb2c127dc9e135796674836c74559f772716",
-                    "nonce" : "0xa4225d155333a770",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x2d511aa3da7558522b6d6bb8ec5c6c6f310abf625d0d650f2d05e32e63a2b8a5",
+                    "mixHash" : "0x352a455243f815bf078df70c4ec0fcd20f5d93792cebb9dc2c0277b57e6edc5a",
+                    "nonce" : "0xc4b3b970f9172689",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x52a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaa",
-                    "stateRoot" : "0x9c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c5a7224d3cf31f0f3f7d7e5bb61fd4245011999fc311bde2894a1d4c570b6a8a05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a052a880139992d9beda254e496000e9759c33aca910ed71cc378957f728231eaab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d38203e880a062343e721ae73d40b6503af79792bb2c127dc9e135796674836c74559f77271688a4225d155333a770f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05c9694fb0ac05572e26bc032fb331e47335f933cb964b1636ab653e4a050e588a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0352a455243f815bf078df70c4ec0fcd20f5d93792cebb9dc2c0277b57e6edc5a88c4b3b970f9172689f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203001ca067ce0c885caab5c843928da798925ec2882cab9dad127e8987c91f5931894028a03decc909aa3dc7c6ec3134cfdaecd9315fbe28d91684c416eb71c0684a166006c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4242ee9115425c79311fb5acf3ee857b373d0fd44a74260bf0e25679c16f93c7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2d511aa3da7558522b6d6bb8ec5c6c6f310abf625d0d650f2d05e32e63a2b8a5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9d3",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f462d",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json
index 1bdf9c083..f378dea29 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d19g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d19g0v0_EIP150" : {
+    "modexp_d19g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d7",
-                    "hash" : "0xbfed5de2449e5b688a0d833b8af0d50a8ea52850061f3c58f10614491aae03a7",
-                    "mixHash" : "0x95c2448e3b5d99e2cecdca9a1698e51a860093e316bebf207931e387addc7fe9",
-                    "nonce" : "0xa8c307c6b9e0fd64",
+                    "hash" : "0x8769fe5de678c78e863eaf27c7097ad5500da15c7cababeb62317daee7b202a6",
+                    "mixHash" : "0x86b2666637055f0109b0d502b563958464b8dae507795e4ac9b99bf44bb7a09a",
+                    "nonce" : "0x17e9fa55e3984429",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
-                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
+                    "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
+                    "stateRoot" : "0x6c32cf91704f6fdbeb79df8317a0f51a2dae5d91e00af5386be658d4cd4e20e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a095c2448e3b5d99e2cecdca9a1698e51a860093e316bebf207931e387addc7fe988a8c307c6b9e0fd64f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c32cf91704f6fdbeb79df8317a0f51a2dae5d91e00af5386be658d4cd4e20e1a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a086b2666637055f0109b0d502b563958464b8dae507795e4ac9b99bf44bb7a09a8817e9fa55e3984429f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfed5de2449e5b688a0d833b8af0d50a8ea52850061f3c58f10614491aae03a7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8769fe5de678c78e863eaf27c7097ad5500da15c7cababeb62317daee7b202a6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d19g0v0_EIP158" : {
+    "modexp_d19g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9d7",
-                    "hash" : "0x23d51f9e3c7706bd8cf86f0a7e10831182bf8e120467e4ad9f09cada9ee5b65a",
-                    "mixHash" : "0x82fe0a716ab23ec19940864cb361cb36e49270ce5620a1d62209424c9ff2260c",
-                    "nonce" : "0x9cfc1f29477d1c6d",
+                    "hash" : "0x5ad5ea10de20e4cfd84c55bd82f1997cc54ec3a453ce1db4b8da4534f61ad4be",
+                    "mixHash" : "0x76701f136f028ec31479c749b93f2a65115e4b435b79fef4d5db386be1693c9c",
+                    "nonce" : "0x28ec20e0f4929912",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
+                    "stateRoot" : "0x6c32cf91704f6fdbeb79df8317a0f51a2dae5d91e00af5386be658d4cd4e20e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c32cf91704f6fdbeb79df8317a0f51a2dae5d91e00af5386be658d4cd4e20e1a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a076701f136f028ec31479c749b93f2a65115e4b435b79fef4d5db386be1693c9c8828ec20e0f4929912f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4",
+                        "s" : "0x707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5ad5ea10de20e4cfd84c55bd82f1997cc54ec3a453ce1db4b8da4534f61ad4be",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9d7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4629",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d19g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d19g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0xec828e8e7228356ff337c55401f099ce4e42de28e44c2dbece92143ab0a43944",
+                    "mixHash" : "0x6ff4355faa67b897c388ba431b84f360202e67bcd89d558a1a380880b6a1c2fb",
+                    "nonce" : "0x15718394f313f1ca",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a082fe0a716ab23ec19940864cb361cb36e49270ce5620a1d62209424c9ff2260c889cfc1f29477d1c6df8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a06ff4355faa67b897c388ba431b84f360202e67bcd89d558a1a380880b6a1c2fb8815718394f313f1caf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23d51f9e3c7706bd8cf86f0a7e10831182bf8e120467e4ad9f09cada9ee5b65a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xec828e8e7228356ff337c55401f099ce4e42de28e44c2dbece92143ab0a43944",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d19g0v0_Frontier" : {
+    "modexp_d19g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xf123ab7f34debcf163012cf6e92a67ad1069cf1a86769ea8db9d37872e8f3657",
-                    "mixHash" : "0xf8a75d66570c37b7bebe5414bd3042707a40ccb6edb8ec0a85b5b83f139bed8a",
-                    "nonce" : "0x1bc85d01061f04b8",
+                    "gasUsed" : "0xb9d7",
+                    "hash" : "0xbf3a31d755e0629803d298227e708c2e9f4bce044f54a8b6fd7c8cc0940ac82a",
+                    "mixHash" : "0x2c6752ee50aae12d528bcd9b65d1534298c313f62243ed64c633666ec3cd8c0f",
+                    "nonce" : "0x6b464aa2c3c5b8bb",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x54726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceaf",
+                    "stateRoot" : "0xa7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f8a75d66570c37b7bebe5414bd3042707a40ccb6edb8ec0a85b5b83f139bed8a881bc85d01061f04b8f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7037e2752d1ae8c183e36bb014e128a05b8c562046429ff4d91962850e04796a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a054726bf38ddf89fb56fa7a29ae4b101e1de19f31f616045beb3411b2f133ceafb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a02c6752ee50aae12d528bcd9b65d1534298c313f62243ed64c633666ec3cd8c0f886b464aa2c3c5b8bbf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf123ab7f34debcf163012cf6e92a67ad1069cf1a86769ea8db9d37872e8f3657",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbf3a31d755e0629803d298227e708c2e9f4bce044f54a8b6fd7c8cc0940ac82a",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9d7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4629",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d19g0v0_Homestead" : {
+    "modexp_d19g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xf73c6c4193250f511810e754206c4e587863c1f238a67269f4beca47a3cf7c7c",
-                    "mixHash" : "0x57ea93890f55453b7a36de855ece009911e43f12a56d1b1ffb122ce26f8afdc7",
-                    "nonce" : "0x7707ed88369273e7",
+                    "hash" : "0x31e797d3114ede5dffa5fdd79dd508755343dd0915230031c39956ca9783341f",
+                    "mixHash" : "0xd92856043eeccc125ab1f3d8bd936f56ab1f6adecc8e27e62fec8578b4ac8334",
+                    "nonce" : "0xf6be1015e0aa2e0a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a057ea93890f55453b7a36de855ece009911e43f12a56d1b1ffb122ce26f8afdc7887707ed88369273e7f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d92856043eeccc125ab1f3d8bd936f56ab1f6adecc8e27e62fec8578b4ac833488f6be1015e0aa2e0af8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf73c6c4193250f511810e754206c4e587863c1f238a67269f4beca47a3cf7c7c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x31e797d3114ede5dffa5fdd79dd508755343dd0915230031c39956ca9783341f",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d19g0v0_Metropolis" : {
+    "modexp_d19g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9d7",
-                    "hash" : "0x3e5d8cab4da7ef78d105ef940b5ded75d25f264308b3a95540d6bc4082a48953",
-                    "mixHash" : "0x3d159823dfbf0132dd73e3802eca2a79626173204490ead94748c4861729f4cd",
-                    "nonce" : "0xa66c5f9c3dbe158c",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x62abf98c2e4bd020800087625997030a772755dc559743c663422ba855090048",
+                    "mixHash" : "0xa1c7e87841918bff5aea25a4db0395a54ccb3fc6b96f4860a62f1ac8eb600798",
+                    "nonce" : "0x0070db37f9b40857",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636ae",
-                    "stateRoot" : "0x6c32cf91704f6fdbeb79df8317a0f51a2dae5d91e00af5386be658d4cd4e20e1",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c32cf91704f6fdbeb79df8317a0f51a2dae5d91e00af5386be658d4cd4e20e1a0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a0541727270700037846b39df3b9a62bfaa32c06e5eabbf1c83d6516097b6636aeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9d78203e880a03d159823dfbf0132dd73e3802eca2a79626173204490ead94748c4861729f4cd88a66c5f9c3dbe158cf8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
+                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c503f537e1dddb6da82b2f2294a4c8edd46f3f43c9c08d660bb41d8a81f41935a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0a1c7e87841918bff5aea25a4db0395a54ccb3fc6b96f4860a62f1ac8eb600798880070db37f9b40857f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b864000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300001ca0a6502a7dce37a22ffd76f12d6514b6ca6c9ffd7827abcc0e73c5335a46bd7fa4a0707ecaca70caf847647a6e39ee9e5d35682e97376f51564d6f385b4dc4bb7a4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e5d8cab4da7ef78d105ef940b5ded75d25f264308b3a95540d6bc4082a48953",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x62abf98c2e4bd020800087625997030a772755dc559743c663422ba855090048",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9d7",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4629",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json
index 9cc1910e0..53c336dea 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d1g0v0_EIP150" : {
+    "modexp_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/stPreCompiledContracts/modexp_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xca0a",
-                    "hash" : "0x18874006077bee0ba019a926731c9914ed5cc8eee9eed0f0787885288795af93",
-                    "mixHash" : "0xa8a134188501349e43609ebaf462fd97d7e9920a741b0a76fd5e99a51fca2537",
-                    "nonce" : "0x812010d3fb1596d7",
+                    "gasUsed" : "0xd43d",
+                    "hash" : "0xa91d38a790bd0b5780ce617c48950f022eeb109abb2a0297cd4b26e35edd17d4",
+                    "mixHash" : "0xd8aa53a5a2c8f092dd44e92c8840ac7eeceede36bd6d89f06fcba7549b57d971",
+                    "nonce" : "0xebff59ec5b23473d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
-                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
+                    "receiptTrie" : "0xa724971ccde86273a230ff1daa0afab34c951b425cc3eed1685c632d275580d4",
+                    "stateRoot" : "0xd5e53e3650bc5911af3b107acc0692985d30978eb97bfb29daf800818dcdb4a0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0a8a134188501349e43609ebaf462fd97d7e9920a741b0a76fd5e99a51fca253788812010d3fb1596d7f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e53e3650bc5911af3b107acc0692985d30978eb97bfb29daf800818dcdb4a0a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a0a724971ccde86273a230ff1daa0afab34c951b425cc3eed1685c632d275580d4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d43d8203e880a0d8aa53a5a2c8f092dd44e92c8840ac7eeceede36bd6d89f06fcba7549b57d97188ebff59ec5b23473df90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18874006077bee0ba019a926731c9914ed5cc8eee9eed0f0787885288795af93",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa91d38a790bd0b5780ce617c48950f022eeb109abb2a0297cd4b26e35edd17d4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca0a",
+                "balance" : "0x4563918244f4d43d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f35f6",
+                "balance" : "0x3635c9adc5de9f2bc3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,123 @@
             }
         }
     },
-    "modexp_d1g0v0_EIP158" : {
+    "modexp_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/stPreCompiledContracts/modexp_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xd43d",
+                    "hash" : "0xc8b81571758d53fbdb13ee7a6b70756b8eb064bfa1665efe045f573bdde921ad",
+                    "mixHash" : "0x1eb9ed29cc3bf92876ef0536057758424377742db2b109e2297ad2db8e66a45d",
+                    "nonce" : "0xd61fb8ffbd5c3c6d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xa724971ccde86273a230ff1daa0afab34c951b425cc3eed1685c632d275580d4",
+                    "stateRoot" : "0xd5e53e3650bc5911af3b107acc0692985d30978eb97bfb29daf800818dcdb4a0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e53e3650bc5911af3b107acc0692985d30978eb97bfb29daf800818dcdb4a0a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a0a724971ccde86273a230ff1daa0afab34c951b425cc3eed1685c632d275580d4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d43d8203e880a01eb9ed29cc3bf92876ef0536057758424377742db2b109e2297ad2db8e66a45d88d61fb8ffbd5c3c6df90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44",
+                        "s" : "0x57c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc8b81571758d53fbdb13ee7a6b70756b8eb064bfa1665efe045f573bdde921ad",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d43d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f2bc3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d1g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xca0a",
-                    "hash" : "0xafafacdedd8db5a96a670106bb73832985080f7491484d9f4cb0083fdcb8d78b",
-                    "mixHash" : "0xcbf3738c4f34b0b48b9740e9d0d5df0712b9c99c44ec97fe347ebb65e4d31501",
-                    "nonce" : "0x1745169225e12f0c",
+                    "hash" : "0xd6abf6837fda1876a40107a62534fa62ea8408a692e247e224ab5348c7dfe766",
+                    "mixHash" : "0xc0701a93f847e971b10bfb3ce638387d90a011dad77411cb0a698a93dc3ed742",
+                    "nonce" : "0xc7041a261046cf74",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0cbf3738c4f34b0b48b9740e9d0d5df0712b9c99c44ec97fe347ebb65e4d31501881745169225e12f0cf90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0c0701a93f847e971b10bfb3ce638387d90a011dad77411cb0a698a93dc3ed74288c7041a261046cf74f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafafacdedd8db5a96a670106bb73832985080f7491484d9f4cb0083fdcb8d78b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd6abf6837fda1876a40107a62534fa62ea8408a692e247e224ab5348c7dfe766",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d1g0v0_Frontier" : {
+    "modexp_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/stPreCompiledContracts/modexp_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x697f48d06160863d4adfa01e3a9d088362f53b8b727ad4c3ee0e05930cb3191a",
-                    "mixHash" : "0xd70a6138f4a5cf27e2d6f085f20b3df8c4ad330f6f4761c9eb49d282e1b43027",
-                    "nonce" : "0xa3310018aab6e93f",
+                    "gasUsed" : "0xca0a",
+                    "hash" : "0x6963288958dbf3ffd9292d1361b7291c5ca8871709f1ec2cd4f0c8b3a811afac",
+                    "mixHash" : "0xa38fc8374cbb19abf5d8b6088db01762b3d03b4e0241ef38544c03aa21a599e8",
+                    "nonce" : "0xb5b4dcd3c8bcfab8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x6579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcd",
+                    "stateRoot" : "0x0dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d70a6138f4a5cf27e2d6f085f20b3df8c4ad330f6f4761c9eb49d282e1b4302788a3310018aab6e93ff90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dfb58c06c432b240c9d1de2c3a0acaf8ede493cd0c2a674083bed81bd22cdd5a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a06579a0d7bd16c2b74faa7881c7bb8221b36ba269b96e9d4803574ac566551fcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ca0a8203e880a0a38fc8374cbb19abf5d8b6088db01762b3d03b4e0241ef38544c03aa21a599e888b5b4dcd3c8bcfab8f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x697f48d06160863d4adfa01e3a9d088362f53b8b727ad4c3ee0e05930cb3191a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6963288958dbf3ffd9292d1361b7291c5ca8871709f1ec2cd4f0c8b3a811afac",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ca0a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f35f6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d1g0v0_Homestead" : {
+    "modexp_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/stPreCompiledContracts/modexp_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd8bc0ec364849963c98b23e64d4e20d9b0f5719e16075deab2cd1555078cc08d",
-                    "mixHash" : "0x55ac5dd0ff6220d949bee36e7ca0b38a005de10ad973f31a6d36591a37449838",
-                    "nonce" : "0xba2a3659c2b8310b",
+                    "hash" : "0x9786e40f3e5839307a1264169f55261b850f20f062d6e94ef84bcf05ecab3a52",
+                    "mixHash" : "0xe9e5fd94b8deeef384042cbdc42a36eee94650c504dd563f443706360d135e8d",
+                    "nonce" : "0xef79aff232aa4bab",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a055ac5dd0ff6220d949bee36e7ca0b38a005de10ad973f31a6d36591a3744983888ba2a3659c2b8310bf90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0e9e5fd94b8deeef384042cbdc42a36eee94650c504dd563f443706360d135e8d88ef79aff232aa4babf90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8bc0ec364849963c98b23e64d4e20d9b0f5719e16075deab2cd1555078cc08d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9786e40f3e5839307a1264169f55261b850f20f062d6e94ef84bcf05ecab3a52",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d1g0v0_Metropolis" : {
+    "modexp_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/stPreCompiledContracts/modexp_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xd43d",
-                    "hash" : "0xa4f6b9b3cd29bc5f68a7ca807251ea799fa61c96b79f85e3cb2a2a2e163f45d3",
-                    "mixHash" : "0x1ebd43a7ba99f02622b76c3f3281af837735818b785b61dd83ca326bfe70a151",
-                    "nonce" : "0x84737290197d94a7",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x951242ed1726add9cbe4e9bff8d9538c86fa4e77a7bba7bda816e860118a5fa5",
+                    "mixHash" : "0x41aa3ff4a22a1660dffd86c80ad5cb64d73692c3f4e95eba6ff6b5073d9f26d4",
+                    "nonce" : "0xfb146593edc75ec1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xa724971ccde86273a230ff1daa0afab34c951b425cc3eed1685c632d275580d4",
-                    "stateRoot" : "0xd5e53e3650bc5911af3b107acc0692985d30978eb97bfb29daf800818dcdb4a0",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e53e3650bc5911af3b107acc0692985d30978eb97bfb29daf800818dcdb4a0a0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a0a724971ccde86273a230ff1daa0afab34c951b425cc3eed1685c632d275580d4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d43d8203e880a01ebd43a7ba99f02622b76c3f3281af837735818b785b61dd83ca326bfe70a1518884737290197d94a7f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0b34d942cc39b2202b860146b49c1a5d038ee348e7f5871d4294fb3a7aa3a7fd4a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a041aa3ff4a22a1660dffd86c80ad5cb64d73692c3f4e95eba6ff6b5073d9f26d488fb146593edc75ec1f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f1ba046cbcd6fce1ea976e64ac5b3ad08048d9b7039d87731a6fb634482310b482f44a057c2a7f523f05e13181c8f912fa4d345110c08d3798d2e331b5d6cd2cb533c8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4f6b9b3cd29bc5f68a7ca807251ea799fa61c96b79f85e3cb2a2a2e163f45d3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x951242ed1726add9cbe4e9bff8d9538c86fa4e77a7bba7bda816e860118a5fa5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d43d",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f2bc3",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json
index ddcf9455e..36b56ca81 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d20g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d20g0v0_EIP150" : {
+    "modexp_d20g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x6cdfceec12a0df81668b4f895256776e92bf21a2dd7a59182348942a41aa50b0",
-                    "mixHash" : "0xba9cfbb5c8ae72bef2241d9acbf6e84a8db4e6e576f184892cb54a5aef9d503c",
-                    "nonce" : "0x79037241d543b972",
+                    "hash" : "0x0c96f3deaf8b264ae1c72fad3e1b692d1d3eafbf37b3316c56727408e6ddae55",
+                    "mixHash" : "0xc1e455a9ac3b0cfc614f876fe0d0656fee068ff2411551ce3dfcadc8cf577bc8",
+                    "nonce" : "0x5a5ce15ea3df4220",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
-                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0xd37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0ba9cfbb5c8ae72bef2241d9acbf6e84a8db4e6e576f184892cb54a5aef9d503c8879037241d543b972f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333ca08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0c1e455a9ac3b0cfc614f876fe0d0656fee068ff2411551ce3dfcadc8cf577bc8885a5ce15ea3df4220f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cdfceec12a0df81668b4f895256776e92bf21a2dd7a59182348942a41aa50b0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0c96f3deaf8b264ae1c72fad3e1b692d1d3eafbf37b3316c56727408e6ddae55",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d20g0v0_EIP158" : {
+    "modexp_d20g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x72d5fab18d54fe1e4fc47faba74ff9bab60fd63c2dc84a1bcd852ddd87ea4e09",
-                    "mixHash" : "0x1d34c8f64a347727059b1a87da515a524dcb4a03add9850dec61666ebbc214f5",
-                    "nonce" : "0xec7d46e1efd69877",
+                    "hash" : "0x2ebd3a8c15b8b81c28d9a177ae49d56de85897e9038812f1cb6a8cd87823c4be",
+                    "mixHash" : "0x3735f4a042b15c126344b77b16e07d21833b04df02ca82c432527721c4b85fa0",
+                    "nonce" : "0x341e9a9b4a15e05a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0xd37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333ca08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a03735f4a042b15c126344b77b16e07d21833b04df02ca82c432527721c4b85fa088341e9a9b4a15e05af8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05",
+                        "s" : "0x4827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ebd3a8c15b8b81c28d9a177ae49d56de85897e9038812f1cb6a8cd87823c4be",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d20g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d20g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xe9942badd2a15fbe299c015f7fe08313d362a9fb6f79a799babc8624c418809e",
+                    "mixHash" : "0xebb3007ce0ddd7cbeaf884d522d92d4de1fb40b1193a027c1ea6095b92166e80",
+                    "nonce" : "0xcd0651eff1e5eb45",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a01d34c8f64a347727059b1a87da515a524dcb4a03add9850dec61666ebbc214f588ec7d46e1efd69877f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0ebb3007ce0ddd7cbeaf884d522d92d4de1fb40b1193a027c1ea6095b92166e8088cd0651eff1e5eb45f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72d5fab18d54fe1e4fc47faba74ff9bab60fd63c2dc84a1bcd852ddd87ea4e09",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe9942badd2a15fbe299c015f7fe08313d362a9fb6f79a799babc8624c418809e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d20g0v0_Frontier" : {
+    "modexp_d20g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd27d556ff446941c692cae65cbcddfca80c677dabefaa2991ce37192a30c997f",
-                    "mixHash" : "0x652f434cbb72dd30b4d00ab6fec5fe25c9729f46ee615fe2c9c6ebf291aa5d9a",
-                    "nonce" : "0x6cb38f43d62f152a",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x35419e72aa94418edb2d9cfbe8889c8930ad4b93907d9b652699186e198703b9",
+                    "mixHash" : "0x4bcafb01ab085171ae3676168665446fbd5893a977399bf64fa9888986f371a6",
+                    "nonce" : "0x080bcfe5c991956f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0652f434cbb72dd30b4d00ab6fec5fe25c9729f46ee615fe2c9c6ebf291aa5d9a886cb38f43d62f152af8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a04bcafb01ab085171ae3676168665446fbd5893a977399bf64fa9888986f371a688080bcfe5c991956ff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd27d556ff446941c692cae65cbcddfca80c677dabefaa2991ce37192a30c997f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x35419e72aa94418edb2d9cfbe8889c8930ad4b93907d9b652699186e198703b9",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9cf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4631",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d20g0v0_Homestead" : {
+    "modexp_d20g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x41982ce05e7cbe7570c02f72ff5149ee271d4c858957dbd70b3731da95a9af0a",
-                    "mixHash" : "0xbbebd33684d336821848f10da176c84238b265f9f3162e4fbd8fd864aa962b75",
-                    "nonce" : "0x57df396d9d3afd05",
+                    "hash" : "0x9366851c96326313953422478f8c48a5457edcac82171d112ad3c150c3b88d9b",
+                    "mixHash" : "0x061a266979c9073b5be9fcf9e4a5e47739160e4b03c143bf4298e72779d8562b",
+                    "nonce" : "0x9719d07b1c3f6d02",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0bbebd33684d336821848f10da176c84238b265f9f3162e4fbd8fd864aa962b758857df396d9d3afd05f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0061a266979c9073b5be9fcf9e4a5e47739160e4b03c143bf4298e72779d8562b889719d07b1c3f6d02f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41982ce05e7cbe7570c02f72ff5149ee271d4c858957dbd70b3731da95a9af0a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9366851c96326313953422478f8c48a5457edcac82171d112ad3c150c3b88d9b",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d20g0v0_Metropolis" : {
+    "modexp_d20g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9cf",
-                    "hash" : "0xcad468a3321727c50709cac26af3880af0964e0e4eb676b32b88f9775d856acf",
-                    "mixHash" : "0x4df8f3a27ca517125b6308e172107f31eace181bbad60c086cf044a87ec8d2a6",
-                    "nonce" : "0xcaa374035e32da41",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x9627b39a3bb6159562e8c7c2f087ab7736cb9b80551331fcdf1532d5ee945a50",
+                    "mixHash" : "0xe1fa03dee48ef1dcba582e80cae28b82e60889890d4d71c66f76234e8be05dd1",
+                    "nonce" : "0xeece74f4f99d90a1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
-                    "stateRoot" : "0xd37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333c",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333ca08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a04df8f3a27ca517125b6308e172107f31eace181bbad60c086cf044a87ec8d2a688caa374035e32da41f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08847fb21b363f84660eea3b2dfad7d5e406c99a54ea525c79f9168896194d383a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0e1fa03dee48ef1dcba582e80cae28b82e60889890d4d71c66f76234e8be05dd188eece74f4f99d90a1f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202031ba0c323e616161216fd63acbe6202c92d0fe9688fb4cd14179f8d607f38e40a0e05a04827a5bf3f68deff5e4029945fdbfca503d2c174765c10ee7ee7fc42782a3df0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcad468a3321727c50709cac26af3880af0964e0e4eb676b32b88f9775d856acf",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9627b39a3bb6159562e8c7c2f087ab7736cb9b80551331fcdf1532d5ee945a50",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9cf",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4631",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json
index a07feda19..a876333ae 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d21g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d21g0v0_EIP150" : {
+    "modexp_d21g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d21g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0x8b72113da6b91e7737d93f4058a588ad7a588da40d617ed979f737ea92a49adb",
-                    "mixHash" : "0xd1c0261274f1aea7dd289cf1d86cd0e5a21b3d3745ae648af1b4ee76d7de5454",
-                    "nonce" : "0x87057ecf5fe49d13",
+                    "hash" : "0x7eca697a2ab3afd34b112228e7180cec6fe9658dc85b518b5f9617cb80de35c6",
+                    "mixHash" : "0xda8d495f046f4494175398fef4bc27941cf9329397d32edb5527974657b4db06",
+                    "nonce" : "0xd9f6877721aa6d59",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
-                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
+                    "receiptTrie" : "0xbc409e91acde02b17d005157c708c5a5c2483fa422fd1699ae64bc4129e5a0df",
+                    "stateRoot" : "0xedba33e4c9b6f011ce03505c2f2d0ac8786b932fedf6b3a182337ddad1823463",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0d1c0261274f1aea7dd289cf1d86cd0e5a21b3d3745ae648af1b4ee76d7de54548887057ecf5fe49d13f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edba33e4c9b6f011ce03505c2f2d0ac8786b932fedf6b3a182337ddad1823463a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a0bc409e91acde02b17d005157c708c5a5c2483fa422fd1699ae64bc4129e5a0dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a0da8d495f046f4494175398fef4bc27941cf9329397d32edb5527974657b4db0688d9f6877721aa6d59f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b72113da6b91e7737d93f4058a588ad7a588da40d617ed979f737ea92a49adb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7eca697a2ab3afd34b112228e7180cec6fe9658dc85b518b5f9617cb80de35c6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d21g0v0_EIP158" : {
+    "modexp_d21g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d21g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba13",
-                    "hash" : "0x8b673b26d7a1aaef7bb3fb27c30816bddf9320529c19e581987e5c3dd5bca0df",
-                    "mixHash" : "0x8b9723b55b1870868bd97843582df70895699048ce6b5904962d286e4bf4a8ae",
-                    "nonce" : "0x606db38a3364aa24",
+                    "hash" : "0x1d3538102ade2de8dcabe2729c6e58d596cf92bc010be6be80dfce1a6f3691fc",
+                    "mixHash" : "0x7978f66665c701455377a9b83e361c0fa7d99de85d451d977976bf6d9f47451c",
+                    "nonce" : "0x3d8b9a0e57c0a16c",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xbc409e91acde02b17d005157c708c5a5c2483fa422fd1699ae64bc4129e5a0df",
+                    "stateRoot" : "0xedba33e4c9b6f011ce03505c2f2d0ac8786b932fedf6b3a182337ddad1823463",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edba33e4c9b6f011ce03505c2f2d0ac8786b932fedf6b3a182337ddad1823463a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a0bc409e91acde02b17d005157c708c5a5c2483fa422fd1699ae64bc4129e5a0dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a07978f66665c701455377a9b83e361c0fa7d99de85d451d977976bf6d9f47451c883d8b9a0e57c0a16cf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6b",
+                        "s" : "0x5b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1d3538102ade2de8dcabe2729c6e58d596cf92bc010be6be80dfce1a6f3691fc",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ba13",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f45ed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d21g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d21g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x9f820b4a655089d857b556292207ff727e0eeae71ea779dc007276441fc3cda5",
+                    "mixHash" : "0x3b3db32c8c10f010d3bd5ca038cad1e637fd99dadb0f809b1d071a1cec5cf57d",
+                    "nonce" : "0x0eeed576da5b6cda",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a08b9723b55b1870868bd97843582df70895699048ce6b5904962d286e4bf4a8ae88606db38a3364aa24f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a03b3db32c8c10f010d3bd5ca038cad1e637fd99dadb0f809b1d071a1cec5cf57d880eeed576da5b6cdaf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b673b26d7a1aaef7bb3fb27c30816bddf9320529c19e581987e5c3dd5bca0df",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9f820b4a655089d857b556292207ff727e0eeae71ea779dc007276441fc3cda5",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d21g0v0_Frontier" : {
+    "modexp_d21g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d21g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xe0e44c8d2346b84458379e4c9803300efdfb935de3d83437ac6ab3c052649ee6",
-                    "mixHash" : "0x539516362cd3d924a4694fa8687cdf83ac9b2ce763b3c9c48f9f221ab4aeec2d",
-                    "nonce" : "0x8142452624281ced",
+                    "gasUsed" : "0xba13",
+                    "hash" : "0x10db2b548918453dab19d59292f45bd26c56e7b9747ce3ec8928ef063e7ba8a3",
+                    "mixHash" : "0x9c84f62082f76bc3d096a2a4406bea2c9660037d688668edb8a57de09f176890",
+                    "nonce" : "0x621958100b3e21be",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x9155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4",
+                    "stateRoot" : "0x77ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0539516362cd3d924a4694fa8687cdf83ac9b2ce763b3c9c48f9f221ab4aeec2d888142452624281cedf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077ff40814f6141aa095928824cc7b49d75ea86790b6dcd12162c2d6647e37ff3a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a09155e9f7355713f6f2e10391f0af42ef480e9f09fedbe59668398cab86ff30f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a09c84f62082f76bc3d096a2a4406bea2c9660037d688668edb8a57de09f17689088621958100b3e21bef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0e44c8d2346b84458379e4c9803300efdfb935de3d83437ac6ab3c052649ee6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x10db2b548918453dab19d59292f45bd26c56e7b9747ce3ec8928ef063e7ba8a3",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ba13",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f45ed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d21g0v0_Homestead" : {
+    "modexp_d21g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d21g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x44b92f4af2f424574253d4f449eb56160b33b7d08cbf1047e42666f4da7248d5",
-                    "mixHash" : "0x126273b24814147ee3c7c0db6e6b4b724ce993a5c5dc6f16d653e80c683f490c",
-                    "nonce" : "0x83bb2ec09489eb53",
+                    "hash" : "0x7c0530baabf1f1638bfc67e14c2b734f7786c006d09207905c9f014200116df7",
+                    "mixHash" : "0x0d454ecea0c43295cc328d58e4961af43681ed8ff57e7dbe78604622ad552a3c",
+                    "nonce" : "0x149c665f66b1a426",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0126273b24814147ee3c7c0db6e6b4b724ce993a5c5dc6f16d653e80c683f490c8883bb2ec09489eb53f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a00d454ecea0c43295cc328d58e4961af43681ed8ff57e7dbe78604622ad552a3c88149c665f66b1a426f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44b92f4af2f424574253d4f449eb56160b33b7d08cbf1047e42666f4da7248d5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7c0530baabf1f1638bfc67e14c2b734f7786c006d09207905c9f014200116df7",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d21g0v0_Metropolis" : {
+    "modexp_d21g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d21g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xba13",
-                    "hash" : "0x4b9b7fa3c5ed4eed481b1ae7ed239ab53727cb39bcc4fa907c4b03db579a7277",
-                    "mixHash" : "0x18e7770bfd7bac1cc9fe7e113ad7854c391bff09758347ac3cbe10f1df52fb31",
-                    "nonce" : "0x36c351f8767a9a4a",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xc9af385b231b72060a1f9c78a935476fb5d59b60fb76ffe5a2780e8a838c519e",
+                    "mixHash" : "0x636ff67800d90fb58077a32af63bd15a41bc6f7bdcb85254f22a29886a315277",
+                    "nonce" : "0xfcd17699feb6f39b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xbc409e91acde02b17d005157c708c5a5c2483fa422fd1699ae64bc4129e5a0df",
-                    "stateRoot" : "0xedba33e4c9b6f011ce03505c2f2d0ac8786b932fedf6b3a182337ddad1823463",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edba33e4c9b6f011ce03505c2f2d0ac8786b932fedf6b3a182337ddad1823463a05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a0bc409e91acde02b17d005157c708c5a5c2483fa422fd1699ae64bc4129e5a0dfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba138203e880a018e7770bfd7bac1cc9fe7e113ad7854c391bff09758347ac3cbe10f1df52fb318836c351f8767a9a4af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05582db272a860615f103d01796d7fbc30e561c8680a83328e52fd80908b30fc1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0636ff67800d90fb58077a32af63bd15a41bc6f7bdcb85254f22a29886a31527788fcd17699feb6f39bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230031ba0354053dde8fbed7ceb4ede75fbdb335e2c448d1ec72194df6eac02753505af6ba05b829cc606213ff3d868d43cc0b0235089204ccb1c6eb563b05de09ec88db3b3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b9b7fa3c5ed4eed481b1ae7ed239ab53727cb39bcc4fa907c4b03db579a7277",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc9af385b231b72060a1f9c78a935476fb5d59b60fb76ffe5a2780e8a838c519e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba13",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f45ed",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json
index e47bf7b8b..365317852 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d22g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d22g0v0_EIP150" : {
+    "modexp_d22g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x837230fe3bd0e3bb3d6acf9c6f9f75bf67991f7d7e95c0d2421db4ccfd87d219",
-                    "mixHash" : "0x4d65fef4c30e9c3df0a84119f996d3aa008c653351fec11449880847a4debe78",
-                    "nonce" : "0xe774befb2a176508",
+                    "hash" : "0x13318225c20cfad6097e40d38cc0908cd099a965997333cc3be03b654b826191",
+                    "mixHash" : "0xc2bb609d00d9c8b9c96c60403473da0242896ba31f63577b9399fec2fcaefc7b",
+                    "nonce" : "0xc1719b47ac20763b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
-                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0xd37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a04d65fef4c30e9c3df0a84119f996d3aa008c653351fec11449880847a4debe7888e774befb2a176508f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333ca027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0c2bb609d00d9c8b9c96c60403473da0242896ba31f63577b9399fec2fcaefc7b88c1719b47ac20763bf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x837230fe3bd0e3bb3d6acf9c6f9f75bf67991f7d7e95c0d2421db4ccfd87d219",
-        "network" : "EIP150",
+        "lastblockhash" : "0x13318225c20cfad6097e40d38cc0908cd099a965997333cc3be03b654b826191",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d22g0v0_EIP158" : {
+    "modexp_d22g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb9cf",
-                    "hash" : "0x45020acef33f54c58eade3abdabf3d62be7609a1eef9e6ac4d0cee8ca6dda03c",
-                    "mixHash" : "0xb8135cd76d352f9fcd9b55090fabba2c313d600fd3adf931cfa02b80b7f1840e",
-                    "nonce" : "0x0dad1f3fb53bdfdc",
+                    "hash" : "0xfa526a4b29a3693f456cad12bf6bce52a825e96e3b1ccba48acd5d7feaeaa75f",
+                    "mixHash" : "0x6d03cd01e492919bdac04551a15f5fc59305bc00721d72641ef83cd1979b357b",
+                    "nonce" : "0x346a6473ced093af",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
+                    "stateRoot" : "0xd37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333ca027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a06d03cd01e492919bdac04551a15f5fc59305bc00721d72641ef83cd1979b357b88346a6473ced093aff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205",
+                        "s" : "0x57f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa526a4b29a3693f456cad12bf6bce52a825e96e3b1ccba48acd5d7feaeaa75f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b9cf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4631",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d22g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d22g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0x364f17967dffc4c8df5dfea539dd3ce6ef386a6fc884b0bfc46d7169e12c6f4b",
+                    "mixHash" : "0x5757e0fea962cbbf7447085a6d1823525fc2eb1c40cbc0ca8e5827e568820ff0",
+                    "nonce" : "0xf39d2db4cee4b63c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a0b8135cd76d352f9fcd9b55090fabba2c313d600fd3adf931cfa02b80b7f1840e880dad1f3fb53bdfdcf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a05757e0fea962cbbf7447085a6d1823525fc2eb1c40cbc0ca8e5827e568820ff088f39d2db4cee4b63cf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45020acef33f54c58eade3abdabf3d62be7609a1eef9e6ac4d0cee8ca6dda03c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x364f17967dffc4c8df5dfea539dd3ce6ef386a6fc884b0bfc46d7169e12c6f4b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d22g0v0_Frontier" : {
+    "modexp_d22g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x4fcbd36fc78ec020e0f91fee3b193bf5e9d936de18629b1dbd75819723f17f85",
-                    "mixHash" : "0xedaa3e20c04d332bc66d228c8410d15ae8ac2901026945b22c1cd8c5cd35ab0c",
-                    "nonce" : "0x0a145b1f669e13e8",
+                    "gasUsed" : "0xb9cf",
+                    "hash" : "0xd7c1e30512878aaaf0509964fe8761e3c94946e8c10483889946b8edcbfeaea7",
+                    "mixHash" : "0x9621e9e27afc921aca3109a52617dc50ae93d216be1728db3997c51678836d59",
+                    "nonce" : "0xae41db48bb07a897",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x1b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872f",
+                    "stateRoot" : "0x585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0edaa3e20c04d332bc66d228c8410d15ae8ac2901026945b22c1cd8c5cd35ab0c880a145b1f669e13e8f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0585a427f5b4f6cda866939c016c541f2a9220fa2c7aef429d22fe122b311f441a027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a01b93c5f5727edc9e938d2b406db97b5841e0adfa949c51f73c2ce1e9fbda872fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a09621e9e27afc921aca3109a52617dc50ae93d216be1728db3997c51678836d5988ae41db48bb07a897f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4fcbd36fc78ec020e0f91fee3b193bf5e9d936de18629b1dbd75819723f17f85",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd7c1e30512878aaaf0509964fe8761e3c94946e8c10483889946b8edcbfeaea7",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b9cf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4631",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d22g0v0_Homestead" : {
+    "modexp_d22g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xeacaf4c7c0ac5589f5961d6f5112e71794cd67f0579d0ded66eff8f128407ec5",
-                    "mixHash" : "0x6f22540da9a4aa7c5f8e681b4042a10b2e0494a4008d27f8e72e54c46acc49a8",
-                    "nonce" : "0xb62e2eee66722feb",
+                    "hash" : "0x0643678e15b97fb1d321a33923c1254bc187f567981834c0117cca711fbae971",
+                    "mixHash" : "0x4bb8faf846a616a5f38e0fb85cd57b16e795f252347707045514b19c55f44d98",
+                    "nonce" : "0x5b69425ff9e5f931",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a06f22540da9a4aa7c5f8e681b4042a10b2e0494a4008d27f8e72e54c46acc49a888b62e2eee66722febf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a04bb8faf846a616a5f38e0fb85cd57b16e795f252347707045514b19c55f44d98885b69425ff9e5f931f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeacaf4c7c0ac5589f5961d6f5112e71794cd67f0579d0ded66eff8f128407ec5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0643678e15b97fb1d321a33923c1254bc187f567981834c0117cca711fbae971",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d22g0v0_Metropolis" : {
+    "modexp_d22g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb9cf",
-                    "hash" : "0xeab347f123c9d7a2748b6e52d0c24b05a4901436c43964eb2f864190e51e88e8",
-                    "mixHash" : "0x2df474fbfb7c6057449f5bada4713905b95ffa9c8efb4e050b8b8e85cd8cf642",
-                    "nonce" : "0xa4fb02733875fd30",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x0a91418eb72f75790aeb2bf4df496894976c0c8ed5db352327d4eb37ecd34500",
+                    "mixHash" : "0xc755ff31dab896c6ea0a074834e3da9edac98d1be07436f52cbee15eb7c89523",
+                    "nonce" : "0x486570191021b18c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x5a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8",
-                    "stateRoot" : "0xd37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333c",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x27f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d37396027d402ca47b378cdb421af170d36c1ee05827f8389115b645741d333ca027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a05a6c1cbd3d680cfbe466824d3560e277a278d4eeaabac1044fd8a91fe1287ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9cf8203e880a02df474fbfb7c6057449f5bada4713905b95ffa9c8efb4e050b8b8e85cd8cf64288a4fb02733875fd30f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada027f4ac9dee617aaf13a526565ad669edccc13d822b6a2fee82d167c4f6a981e9a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0c755ff31dab896c6ea0a074834e3da9edac98d1be07436f52cbee15eb7c8952388486570191021b18cf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202301ca03cb43e7b7d44705b738b664f335cd78310eef779de11edbfad08a99ba4d27205a057f58a4c3e93114612d7edae99c9d982bea6c51fa043be9b973629e785835997c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeab347f123c9d7a2748b6e52d0c24b05a4901436c43964eb2f864190e51e88e8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0a91418eb72f75790aeb2bf4df496894976c0c8ed5db352327d4eb37ecd34500",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b9cf",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4631",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json
index 7e468740f..40f1e8c87 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d23g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d23g0v0_EIP150" : {
+    "modexp_d23g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d23g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0xca576ebfadc22d3f70d8063aa0cd4a7d2cf34dc35ceecbc92dcd7f939c6a8a5f",
-                    "mixHash" : "0x02287162f5ec23aac0f29f671e76bad8212e3b5c6e2ef73f0dbaa4817a742c8d",
-                    "nonce" : "0x76b7115082f32263",
+                    "hash" : "0x58a4f6e8033a525ca90e596079ce2a5cb5a54d73d0d622689e76596f4edc48e1",
+                    "mixHash" : "0x858c19f3dffa6e7b12b713f3548dd6bbb2c51a90fb5dbe66f76db5b813d19f09",
+                    "nonce" : "0x7a2bd2d26b755af6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
-                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
+                    "stateRoot" : "0x3582623fe548d10d6d690171197493f8c729579cf9630ddea5b06f5dd323940d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a002287162f5ec23aac0f29f671e76bad8212e3b5c6e2ef73f0dbaa4817a742c8d8876b7115082f32263f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03582623fe548d10d6d690171197493f8c729579cf9630ddea5b06f5dd323940da0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0858c19f3dffa6e7b12b713f3548dd6bbb2c51a90fb5dbe66f76db5b813d19f09887a2bd2d26b755af6f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca576ebfadc22d3f70d8063aa0cd4a7d2cf34dc35ceecbc92dcd7f939c6a8a5f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x58a4f6e8033a525ca90e596079ce2a5cb5a54d73d0d622689e76596f4edc48e1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d23g0v0_EIP158" : {
+    "modexp_d23g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d23g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0x8523a96af2242cc239d035de84d594dafa53c42619f1536149979210bdb0766b",
-                    "mixHash" : "0xcb0d896f1f4731effbcd5f21eb05709b12aba02cad0744ddacd239c0fed49f87",
-                    "nonce" : "0xe7e0d31442a205dc",
+                    "hash" : "0x0a354ed14079819a2cb3bc3f31dd264b1c69d38a726daf9db151e94d742362c8",
+                    "mixHash" : "0x59b93c7fd130b6ef13d933b3d37345ff36164fd176d379b7cc2e2321542b00ec",
+                    "nonce" : "0x131f2b1e3054361d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
+                    "stateRoot" : "0x3582623fe548d10d6d690171197493f8c729579cf9630ddea5b06f5dd323940d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03582623fe548d10d6d690171197493f8c729579cf9630ddea5b06f5dd323940da0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a059b93c7fd130b6ef13d933b3d37345ff36164fd176d379b7cc2e2321542b00ec88131f2b1e3054361df8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6af",
+                        "s" : "0x3b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0a354ed14079819a2cb3bc3f31dd264b1c69d38a726daf9db151e94d742362c8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4675",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d23g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d23g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x930a0115eeb9a087d183e2ffaca6bdc5e810dd91d3523938e533463697735b86",
+                    "mixHash" : "0xa2ca5d79b3be742b2162277c1b6ec8d24f4d7581b6322e055cfb87eafed1a71d",
+                    "nonce" : "0xfc7443fcc69b3d52",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0cb0d896f1f4731effbcd5f21eb05709b12aba02cad0744ddacd239c0fed49f8788e7e0d31442a205dcf8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a0a2ca5d79b3be742b2162277c1b6ec8d24f4d7581b6322e055cfb87eafed1a71d88fc7443fcc69b3d52f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8523a96af2242cc239d035de84d594dafa53c42619f1536149979210bdb0766b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x930a0115eeb9a087d183e2ffaca6bdc5e810dd91d3523938e533463697735b86",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d23g0v0_Frontier" : {
+    "modexp_d23g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d23g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x48ef8bfefecc720433dc6e6d26b32756e36ab3604547050356f4803e15027d0f",
-                    "mixHash" : "0xb0f227eaa8991775300bd8bf594c28dab71340737d91617601d5fabd029fe659",
-                    "nonce" : "0x8af7f145d5ef81ff",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x2ba0062e46f889e63172f6ecf4b72a5b4556453a0137b204e0c877132f03ee6a",
+                    "mixHash" : "0x52fdd08fb1da887733fe3dde28f7b8c14fece0c563c5ea7e96e9833471265692",
+                    "nonce" : "0x4c49358b32ff3070",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b0f227eaa8991775300bd8bf594c28dab71340737d91617601d5fabd029fe659888af7f145d5ef81fff8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a052fdd08fb1da887733fe3dde28f7b8c14fece0c563c5ea7e96e9833471265692884c49358b32ff3070f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48ef8bfefecc720433dc6e6d26b32756e36ab3604547050356f4803e15027d0f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2ba0062e46f889e63172f6ecf4b72a5b4556453a0137b204e0c877132f03ee6a",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b98b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4675",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d23g0v0_Homestead" : {
+    "modexp_d23g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d23g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xb78ad697f525b9eb4af35d89b7f507352a9e86c82eb95dd166369f9b9101ceef",
-                    "mixHash" : "0x4fb0e565a81d713a41a8bbfb505ddbfddce1c95e01ad2fee5129120df101219b",
-                    "nonce" : "0x28e1db6012d119ef",
+                    "hash" : "0x06f03b47472746a8d93546d46aca25912cd37171f2ccc46f4877442701fc18e4",
+                    "mixHash" : "0x5fa0970ec97a7028a050d7c7ddac924cf3f5e279532686399b848d94e99443a3",
+                    "nonce" : "0x1cf95e8dc25cec87",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a04fb0e565a81d713a41a8bbfb505ddbfddce1c95e01ad2fee5129120df101219b8828e1db6012d119eff8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a05fa0970ec97a7028a050d7c7ddac924cf3f5e279532686399b848d94e99443a3881cf95e8dc25cec87f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb78ad697f525b9eb4af35d89b7f507352a9e86c82eb95dd166369f9b9101ceef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x06f03b47472746a8d93546d46aca25912cd37171f2ccc46f4877442701fc18e4",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d23g0v0_Metropolis" : {
+    "modexp_d23g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d23g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb98b",
-                    "hash" : "0xeeda3e407a63750be497820213c1a3c5c1fe7a3dff0df64ec8a6192804468c96",
-                    "mixHash" : "0x3b07f7d97b0ea99161e9803ffdcc6ac11bc67e0f6805adefbf69013abe71be73",
-                    "nonce" : "0x67c468fe99f46106",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x3bbd632e5c60ff99c01784501074d9e2e033e94fa6ac5e12ffdc05005cd81cb9",
+                    "mixHash" : "0x0fb33bfe90fed9a8474b519ffa2010ea5111bc0b89a12cb173f7daaf1572ed32",
+                    "nonce" : "0x63a6611741fccec2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xd7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1",
-                    "stateRoot" : "0x3582623fe548d10d6d690171197493f8c729579cf9630ddea5b06f5dd323940d",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03582623fe548d10d6d690171197493f8c729579cf9630ddea5b06f5dd323940da0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a0d7d57d54c7fce1d7b8e40997e6c62d702a9ca7e7aa3a63d5c6ee1efca39b2dd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a03b07f7d97b0ea99161e9803ffdcc6ac11bc67e0f6805adefbf69013abe71be738867c468fe99f46106f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
+                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0491e942e540d7ee3e19dfcad84a5eae410c7e9387de6cccc630c1a53059f3d87a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a00fb33bfe90fed9a8474b519ffa2010ea5111bc0b89a12cb173f7daaf1572ed328863a6611741fccec2f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002021ca0f2a120900e41e4196891e35b13e499f67a05b7e9cee93c4188837cb82b27f6afa03b9061ff1ae649337cf3c56cdb9cf3a7d2449140c1da86e75592cc0b96a328b3c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeeda3e407a63750be497820213c1a3c5c1fe7a3dff0df64ec8a6192804468c96",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3bbd632e5c60ff99c01784501074d9e2e033e94fa6ac5e12ffdc05005cd81cb9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b98b",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4675",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json
index 4c906bf9b..74a74e0ab 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d24g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d24g0v0_EIP150" : {
+    "modexp_d24g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb944",
-                    "hash" : "0xf2828bce9e21cab6373c0cd99f763fc39813071593ac41bbc805f0373e1e7c03",
-                    "mixHash" : "0x0c84a3523fc2a0cee65ef2787fc49ccef3040d4c1cc23bbf670874ff06ed1ba0",
-                    "nonce" : "0xff915bb3d2c660c3",
+                    "hash" : "0x3d0716673014f8d9e4a39cba0858866c26391a89c7998c6af310a6f457a2a2db",
+                    "mixHash" : "0xdd12c3233cf888f4602c412087f36eb62cce065228f31728d28d5c2020291343",
+                    "nonce" : "0xb5d3a73bca1fb6e2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
-                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
+                    "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
+                    "stateRoot" : "0x8a2e79985b8b29e10207b225e904874f8b3dcd0aa2ec62a1002d085e38131835",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a00c84a3523fc2a0cee65ef2787fc49ccef3040d4c1cc23bbf670874ff06ed1ba088ff915bb3d2c660c3f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a2e79985b8b29e10207b225e904874f8b3dcd0aa2ec62a1002d085e38131835a09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0dd12c3233cf888f4602c412087f36eb62cce065228f31728d28d5c202029134388b5d3a73bca1fb6e2f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2828bce9e21cab6373c0cd99f763fc39813071593ac41bbc805f0373e1e7c03",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3d0716673014f8d9e4a39cba0858866c26391a89c7998c6af310a6f457a2a2db",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d24g0v0_EIP158" : {
+    "modexp_d24g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb944",
-                    "hash" : "0x1b9f750c13484da0ca9213244ff0518a5265b6958f26341f20d295ae649cd66e",
-                    "mixHash" : "0x89102ae4b08d9435368d44b7cef78b0a366df1f85b172d7d1d90a51fdc35bdbd",
-                    "nonce" : "0x4b8785cf95de64fb",
+                    "hash" : "0x3d672eb1da64cb1caac9c3cbf09ae601280ae374f20b78a839642ff37afa100b",
+                    "mixHash" : "0xc19c2977620ed1bcc583fe162075ea90acd877c690bfd99b851ca199bb1c9032",
+                    "nonce" : "0x29cb5983cbd87937",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
+                    "stateRoot" : "0x8a2e79985b8b29e10207b225e904874f8b3dcd0aa2ec62a1002d085e38131835",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a2e79985b8b29e10207b225e904874f8b3dcd0aa2ec62a1002d085e38131835a09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0c19c2977620ed1bcc583fe162075ea90acd877c690bfd99b851ca199bb1c90328829cb5983cbd87937f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dc",
+                        "s" : "0x144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3d672eb1da64cb1caac9c3cbf09ae601280ae374f20b78a839642ff37afa100b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b944",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d24g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d24g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0xa90f238d19b15bbace58e30410d04d5bda0606184054652acbe55578e119a79b",
+                    "mixHash" : "0xedd77bfcc97db660339f1d8af65e39275dc5fcd9990ce6d49cc06dd49faad215",
+                    "nonce" : "0x95f8dc44f9101e39",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a089102ae4b08d9435368d44b7cef78b0a366df1f85b172d7d1d90a51fdc35bdbd884b8785cf95de64fbf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a0edd77bfcc97db660339f1d8af65e39275dc5fcd9990ce6d49cc06dd49faad2158895f8dc44f9101e39f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b9f750c13484da0ca9213244ff0518a5265b6958f26341f20d295ae649cd66e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa90f238d19b15bbace58e30410d04d5bda0606184054652acbe55578e119a79b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d24g0v0_Frontier" : {
+    "modexp_d24g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x1d2fd3c72d209c38814b70d1d9571daa45d2b91dc1417b0a445e5cefa46060c0",
-                    "mixHash" : "0xd8f6fd48e804e8d7d358496771554d104c39832fe16e216a1973590d8e8183ee",
-                    "nonce" : "0x06ecf3284f0e5ed3",
+                    "gasUsed" : "0xb944",
+                    "hash" : "0x89648c3b2e6c612e9ef8c4a625eceb10429296529ec4b948d3174e8ac546190a",
+                    "mixHash" : "0x78ba8b983463e038eb8858483a77cf8dbf6208e82cf64a69362091a9dd9d5a76",
+                    "nonce" : "0x21fd4a58239644a9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xbab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5e",
+                    "stateRoot" : "0x520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d8f6fd48e804e8d7d358496771554d104c39832fe16e216a1973590d8e8183ee8806ecf3284f0e5ed3f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0520d43ce5513508d21a91a96b8c308ee4c7540f584373d3ad83fc9e3aac9d56da09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a0bab1d03c512411e38f8407bb86cbf6b64230b8e543711f0073cefa0a810cfd5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a078ba8b983463e038eb8858483a77cf8dbf6208e82cf64a69362091a9dd9d5a768821fd4a58239644a9f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d2fd3c72d209c38814b70d1d9571daa45d2b91dc1417b0a445e5cefa46060c0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x89648c3b2e6c612e9ef8c4a625eceb10429296529ec4b948d3174e8ac546190a",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b944",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f46bc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d24g0v0_Homestead" : {
+    "modexp_d24g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x7cb6a27ba920a1d12d8f38b25d5b494c84c954c47102aad6612171b43035ff02",
-                    "mixHash" : "0xfd35d28a26f9c6a2332155353cf4004e913f36d670674664c067ba71f12d9d7d",
-                    "nonce" : "0x4476baba05ff7a57",
+                    "hash" : "0x68877ce90b7592dfdbcddf3f5c43205873db653c2c8c9ee1cd5e88a63f7aec54",
+                    "mixHash" : "0xb87c40347bcfadcb4c56cb258f2fcc0f0e88bcd05498a941c4a665f8c524c6d5",
+                    "nonce" : "0xbe1d0160962475ee",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0fd35d28a26f9c6a2332155353cf4004e913f36d670674664c067ba71f12d9d7d884476baba05ff7a57f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b87c40347bcfadcb4c56cb258f2fcc0f0e88bcd05498a941c4a665f8c524c6d588be1d0160962475eef8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cb6a27ba920a1d12d8f38b25d5b494c84c954c47102aad6612171b43035ff02",
-        "network" : "Homestead",
+        "lastblockhash" : "0x68877ce90b7592dfdbcddf3f5c43205873db653c2c8c9ee1cd5e88a63f7aec54",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d24g0v0_Metropolis" : {
+    "modexp_d24g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb944",
-                    "hash" : "0xc80be0573849d5890a5fd65b0bf29312462a6b2ba2df410dce811f9f9e19d852",
-                    "mixHash" : "0x2de0244b76a090fb2e629a816062704f90495a63054e86824abd17f914312e58",
-                    "nonce" : "0xffcdf463ac0d36be",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xb8e3da82dd7c99cf650a7800381aa71490b26c05fb7aea1ba8207ebf94570fa2",
+                    "mixHash" : "0x6c85ee4123574a906bcbbe846cdde275df92dd7b297b6a03eaa90405daeb7c11",
+                    "nonce" : "0xcc0ceb55c4987d49",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x99d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22",
-                    "stateRoot" : "0x8a2e79985b8b29e10207b225e904874f8b3dcd0aa2ec62a1002d085e38131835",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a2e79985b8b29e10207b225e904874f8b3dcd0aa2ec62a1002d085e38131835a09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a099d994ea053b1acdcd5375565e9420b41f20a7a052f99b22662823be8c80ac22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9448203e880a02de0244b76a090fb2e629a816062704f90495a63054e86824abd17f914312e5888ffcdf463ac0d36bef8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
+                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09332a74725c19c93b0888138163f5f1086bbb75388682bbc0b33b48402619586a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a06c85ee4123574a906bcbbe846cdde275df92dd7b297b6a03eaa90405daeb7c1188cc0ceb55c4987d49f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca0529ab831eac516de3eab034292899ebcdc2a51cebd1cdebdcebad16b6bf7a2dca0144da8c41d2284f134abf1f92e942677b3e6ad18e5cc6d1b04f0bbd8c702a422c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc80be0573849d5890a5fd65b0bf29312462a6b2ba2df410dce811f9f9e19d852",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb8e3da82dd7c99cf650a7800381aa71490b26c05fb7aea1ba8207ebf94570fa2",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b944",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f46bc",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json
index d1a97bb27..11ec13bdd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d25g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d25g0v0_EIP150" : {
+    "modexp_d25g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d25g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xba5f",
-                    "hash" : "0x1d7b96d0ffd279811fccaf081f8550310b362ea08244002fbda53d623aec8311",
-                    "mixHash" : "0xdd2c3435bdb19456b6426cbcb2aec37733e064d60c1e34fe23dd1a3983d8fc37",
-                    "nonce" : "0x23ae31b90b80fd3d",
+                    "gasUsed" : "0xf4f7",
+                    "hash" : "0x557efd693447ebf7d84ceae200bbac61b55b3e23c304a579d6e698510260a159",
+                    "mixHash" : "0xe076679c1180c5a0b093ca515c0c3e36620bab15a6108de87c1a2dbbf8e41dc0",
+                    "nonce" : "0x4f07c213a129f2d1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
-                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
+                    "receiptTrie" : "0xdfdab02940579b7756d88e42b442f5a5cc46412f7b342cf923dbc7b764b20e96",
+                    "stateRoot" : "0xf0a4b60dda6887344aa71319cc099e2db95e729da2b7402b7b6277283d1ae3f2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a0dd2c3435bdb19456b6426cbcb2aec37733e064d60c1e34fe23dd1a3983d8fc378823ae31b90b80fd3df8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0a4b60dda6887344aa71319cc099e2db95e729da2b7402b7b6277283d1ae3f2a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0dfdab02940579b7756d88e42b442f5a5cc46412f7b342cf923dbc7b764b20e96b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4f78203e880a0e076679c1180c5a0b093ca515c0c3e36620bab15a6108de87c1a2dbbf8e41dc0884f07c213a129f2d1f8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d7b96d0ffd279811fccaf081f8550310b362ea08244002fbda53d623aec8311",
-        "network" : "EIP150",
+        "lastblockhash" : "0x557efd693447ebf7d84ceae200bbac61b55b3e23c304a579d6e698510260a159",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba5f",
+                "balance" : "0x4563918244f4f4f7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f45a1",
+                "balance" : "0x3635c9adc5de9f0b09",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d25g0v0_EIP158" : {
+    "modexp_d25g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d25g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4f7",
+                    "hash" : "0x8ce943562af196f4ed56e58d93832c3ff7c379c0c3ac767c06935ed813c7855c",
+                    "mixHash" : "0xe9daaa149fd8d7e6a237e3aafe47ded25bbb3c21010de2f1208cded6b9afecc7",
+                    "nonce" : "0xce7ac7be48abe54d",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xdfdab02940579b7756d88e42b442f5a5cc46412f7b342cf923dbc7b764b20e96",
+                    "stateRoot" : "0xf0a4b60dda6887344aa71319cc099e2db95e729da2b7402b7b6277283d1ae3f2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0a4b60dda6887344aa71319cc099e2db95e729da2b7402b7b6277283d1ae3f2a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0dfdab02940579b7756d88e42b442f5a5cc46412f7b342cf923dbc7b764b20e96b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4f78203e880a0e9daaa149fd8d7e6a237e3aafe47ded25bbb3c21010de2f1208cded6b9afecc788ce7ac7be48abe54df8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200ba",
+                        "s" : "0x2b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8ce943562af196f4ed56e58d93832c3ff7c379c0c3ac767c06935ed813c7855c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f4f7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b09",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d25g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d25g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba5f",
-                    "hash" : "0x218bb10fcedf949154d710dc7495ffcc5406b3d8b11e7c28054df8bfaf6983c2",
-                    "mixHash" : "0xf20f39379acddf66a4326088ea384f9cb755108a742155a32fed3c2b0155f9e3",
-                    "nonce" : "0x27d8dd65582a0588",
+                    "hash" : "0x9997b98761d07725bce94478a83d648248733015f4d2ce2a434851340219696b",
+                    "mixHash" : "0x6b754d9eff5d39192cfaa5c6a9b7cdecbb8c71e107613126e3d229891be0df91",
+                    "nonce" : "0xa1367f08df17fa5e",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a0f20f39379acddf66a4326088ea384f9cb755108a742155a32fed3c2b0155f9e38827d8dd65582a0588f8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a06b754d9eff5d39192cfaa5c6a9b7cdecbb8c71e107613126e3d229891be0df9188a1367f08df17fa5ef8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x218bb10fcedf949154d710dc7495ffcc5406b3d8b11e7c28054df8bfaf6983c2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9997b98761d07725bce94478a83d648248733015f4d2ce2a434851340219696b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d25g0v0_Frontier" : {
+    "modexp_d25g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d25g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x832fa7f66891c702ee36626c11c677376b343dd9ce311f08e2b5f531e3613903",
-                    "mixHash" : "0x753efb7d25bde8b79cd8b53f4b2cc562979cd112c9dfa4cba38e46bcd30e9b92",
-                    "nonce" : "0x1b08a7b973bac6dd",
+                    "gasUsed" : "0xba5f",
+                    "hash" : "0x98bc4f3f29daa5dc11448bc4c07bec4b3a98b62c59bf69b92e8797b23c728011",
+                    "mixHash" : "0x962bc88b3df91ad14eff2c3c7365a426cf8aad79f0b98dc394eab6f98daed9ef",
+                    "nonce" : "0x5a9d4debba360026",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xc954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7",
+                    "stateRoot" : "0xab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902cbf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0753efb7d25bde8b79cd8b53f4b2cc562979cd112c9dfa4cba38e46bcd30e9b92881b08a7b973bac6ddf8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab76ebf3711b30fe22286f88b179283f1dc960cf6e3f24ec4c31e1de4d4ceb51a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0c954780ba10e43178408e87d967f08780ead210196c06ab068ffd77388a653b7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba5f8203e880a0962bc88b3df91ad14eff2c3c7365a426cf8aad79f0b98dc394eab6f98daed9ef885a9d4debba360026f8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x832fa7f66891c702ee36626c11c677376b343dd9ce311f08e2b5f531e3613903",
-        "network" : "Frontier",
+        "lastblockhash" : "0x98bc4f3f29daa5dc11448bc4c07bec4b3a98b62c59bf69b92e8797b23c728011",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ba5f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f45a1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d25g0v0_Homestead" : {
+    "modexp_d25g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d25g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x580a8bb63871d55cb38e313d250b93dfde26be63570623c0164cab0f7c5c650a",
-                    "mixHash" : "0x8d6256f6c89d9c99d60468151bf7fdb081c9c22f2b5e407a783a6051893e02bc",
-                    "nonce" : "0xe51aa09b1cf47fdb",
+                    "hash" : "0x6c81ce38b4387d3296cea3ba6c649b5bb6a9dffadd3c25b2ca8de4596f7a9dc8",
+                    "mixHash" : "0xd5395a66a98468a4ce79aba8fa8cebf63995ec488cbecfef4c7b9a2c7cf97f39",
+                    "nonce" : "0xa5b029b2ee952e3a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902cbf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a08d6256f6c89d9c99d60468151bf7fdb081c9c22f2b5e407a783a6051893e02bc88e51aa09b1cf47fdbf8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902cbf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d5395a66a98468a4ce79aba8fa8cebf63995ec488cbecfef4c7b9a2c7cf97f3988a5b029b2ee952e3af8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x580a8bb63871d55cb38e313d250b93dfde26be63570623c0164cab0f7c5c650a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6c81ce38b4387d3296cea3ba6c649b5bb6a9dffadd3c25b2ca8de4596f7a9dc8",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d25g0v0_Metropolis" : {
+    "modexp_d25g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d25g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf4f7",
-                    "hash" : "0x2a33e97e92defc6ba4fac4544c374062e0ee03e00d801d2eafe61aee8ecd1fb3",
-                    "mixHash" : "0x947752c06e2d5e1fc87c33c8eb60facaea9e5ca018bf81639723969bf97f3404",
-                    "nonce" : "0x0d30544a5d667eb7",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x8c462d131543abf1ee3a5794b234133930fe14d02ce6ada0ec13e7d088e09a24",
+                    "mixHash" : "0x03b85d89e79d39813235eeea930091531fb1351243accffce62b8fa51b73e814",
+                    "nonce" : "0xf21ea5b9159e120a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xdfdab02940579b7756d88e42b442f5a5cc46412f7b342cf923dbc7b764b20e96",
-                    "stateRoot" : "0xf0a4b60dda6887344aa71319cc099e2db95e729da2b7402b7b6277283d1ae3f2",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0a4b60dda6887344aa71319cc099e2db95e729da2b7402b7b6277283d1ae3f2a0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da0dfdab02940579b7756d88e42b442f5a5cc46412f7b342cf923dbc7b764b20e96b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4f78203e880a0947752c06e2d5e1fc87c33c8eb60facaea9e5ca018bf81639723969bf97f3404880d30544a5d667eb7f8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
+                "rlp" : "0xf902cbf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0fa04151cd3d1cf5fcb1ae78eb952ab7ddab919309027ec54141a6c3bd81fbe2da08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a003b85d89e79d39813235eeea930091531fb1351243accffce62b8fa51b73e81488f21ea5b9159e120af8caf8c880018405f5e10094100000000000000000000000000000000000000080b8660000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010010010100101ca0638c3c802f75dab6aa71669a6c37c8c1ce9f16aa349e86d227202691e65200baa02b46d4349d4e269ce3fd2e248ec172ac3b1d5c994f13b3dfa5cbcded180c0a56c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a33e97e92defc6ba4fac4544c374062e0ee03e00d801d2eafe61aee8ecd1fb3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8c462d131543abf1ee3a5794b234133930fe14d02ce6ada0ec13e7d088e09a24",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f4f7",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0b09",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json
index de46f2a4d..ac51005fe 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d26g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d26g0v0_EIP150" : {
+    "modexp_d26g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d26g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb993",
-                    "hash" : "0xe45751971aeafe0e8fca5678ffe86869431c4f3d3a3f53c8eb2467a5c148e2dc",
-                    "mixHash" : "0x93681363137ba4cafa3bc77cb0c01efdf33b40a824bcf6c8090d4f0b6cf4f63e",
-                    "nonce" : "0x98d3c380b38546b9",
+                    "gasUsed" : "0xf42b",
+                    "hash" : "0x6651cba16e408d5011df0eb2411687c2acfd86531b3de55ed0c6c475478a2187",
+                    "mixHash" : "0x5c4a8f2c10423bce6aa7a6a92c7ab65e4a10ea1c4ef56200782b86701b37d8f5",
+                    "nonce" : "0xed9ab849d9cbc36d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
-                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
+                    "stateRoot" : "0x00095383f342cebe2c1cc8785cd1d71dc1fd3e307a4cd1950c8aab7fe923fcac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a093681363137ba4cafa3bc77cb0c01efdf33b40a824bcf6c8090d4f0b6cf4f63e8898d3c380b38546b9f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000095383f342cebe2c1cc8785cd1d71dc1fd3e307a4cd1950c8aab7fe923fcaca0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a05c4a8f2c10423bce6aa7a6a92c7ab65e4a10ea1c4ef56200782b86701b37d8f588ed9ab849d9cbc36df8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe45751971aeafe0e8fca5678ffe86869431c4f3d3a3f53c8eb2467a5c148e2dc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6651cba16e408d5011df0eb2411687c2acfd86531b3de55ed0c6c475478a2187",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b993",
+                "balance" : "0x4563918244f4f42b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f466d",
+                "balance" : "0x3635c9adc5de9f0bd5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d26g0v0_EIP158" : {
+    "modexp_d26g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d26g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf42b",
+                    "hash" : "0x8af9b61f64817010c12c0279acd6c068babba4ff6ccb437eecd9f22b879390ac",
+                    "mixHash" : "0x24bfc53f4ed5b1aeca3b232e9c3c6c0dce8f7b2b1bf4895e2918b9456804a0c2",
+                    "nonce" : "0x00be90ba7896a91b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
+                    "stateRoot" : "0x00095383f342cebe2c1cc8785cd1d71dc1fd3e307a4cd1950c8aab7fe923fcac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000095383f342cebe2c1cc8785cd1d71dc1fd3e307a4cd1950c8aab7fe923fcaca0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a024bfc53f4ed5b1aeca3b232e9c3c6c0dce8f7b2b1bf4895e2918b9456804a0c28800be90ba7896a91bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482d",
+                        "s" : "0x3be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313f",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8af9b61f64817010c12c0279acd6c068babba4ff6ccb437eecd9f22b879390ac",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f42b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bd5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d26g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d26g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb993",
-                    "hash" : "0x327b848c7079ad87e58e1af6b9d4b00dd58a35f5f6e83f69d05f3146c32efc8b",
-                    "mixHash" : "0x1f778046a13d0fbba7074c6b34328b4defe3c9ecceb1b541f1d7b0781f73c385",
-                    "nonce" : "0x6036bf86561c2b03",
+                    "hash" : "0x4a4d9e5c1372b9187ddada917684ca60662b1a73d40a3b56a6fc75b3f1c4934f",
+                    "mixHash" : "0x44286a776364e3c337814629920e60ca777c9643c7d3d715faed91eddbe0fdac",
+                    "nonce" : "0x007f05d4322b3653",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a01f778046a13d0fbba7074c6b34328b4defe3c9ecceb1b541f1d7b0781f73c385886036bf86561c2b03f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a044286a776364e3c337814629920e60ca777c9643c7d3d715faed91eddbe0fdac88007f05d4322b3653f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x327b848c7079ad87e58e1af6b9d4b00dd58a35f5f6e83f69d05f3146c32efc8b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4a4d9e5c1372b9187ddada917684ca60662b1a73d40a3b56a6fc75b3f1c4934f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d26g0v0_Frontier" : {
+    "modexp_d26g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d26g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xaad46aea4809e10c87d51d622086982298053487c608288a4dd0dc0017444b91",
-                    "mixHash" : "0x9e4d95bf750553cf084c8d433992be404cdd697b8b7e21633b0d2b0587271cf1",
-                    "nonce" : "0x86a4e96eb3fd4ee6",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0x78a67999b01c18d6827c4198d21f1d9337fd39e0fedfa81f4d818908a18e16e6",
+                    "mixHash" : "0xe23fcfd02630299a7d225605dc49f990ca6d206329185cec3e342c9e0a1e2158",
+                    "nonce" : "0x84b6014dae305773",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a09e4d95bf750553cf084c8d433992be404cdd697b8b7e21633b0d2b0587271cf18886a4e96eb3fd4ee6f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0e23fcfd02630299a7d225605dc49f990ca6d206329185cec3e342c9e0a1e21588884b6014dae305773f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaad46aea4809e10c87d51d622086982298053487c608288a4dd0dc0017444b91",
-        "network" : "Frontier",
+        "lastblockhash" : "0x78a67999b01c18d6827c4198d21f1d9337fd39e0fedfa81f4d818908a18e16e6",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b993",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f466d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d26g0v0_Homestead" : {
+    "modexp_d26g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d26g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x47c29e32743a274c5d97a165b6c9f5737926a74943603e40554b86b6c16b13c4",
-                    "mixHash" : "0x758ac44e0271b72d3e91ad1181dbcee11c666b7202b7ff1967ba96909fed5304",
-                    "nonce" : "0xc4393ad780364f56",
+                    "hash" : "0x3bb126d0c9c22ab4432572e677b73d7205aa21ac25b439844e186c5df7f1539b",
+                    "mixHash" : "0xd1e354ab25acdd994a1156dacd85ad71cc5bcdbeb28c71975932a1310fe32bf1",
+                    "nonce" : "0x349b50e010e73a2e",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0758ac44e0271b72d3e91ad1181dbcee11c666b7202b7ff1967ba96909fed530488c4393ad780364f56f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d1e354ab25acdd994a1156dacd85ad71cc5bcdbeb28c71975932a1310fe32bf188349b50e010e73a2ef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47c29e32743a274c5d97a165b6c9f5737926a74943603e40554b86b6c16b13c4",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3bb126d0c9c22ab4432572e677b73d7205aa21ac25b439844e186c5df7f1539b",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d26g0v0_Metropolis" : {
+    "modexp_d26g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d26g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf42b",
-                    "hash" : "0xfba4f667f79962ac88dac700c256eac1623d9a9692522f103c2d8cbaa61da1b4",
-                    "mixHash" : "0x607540ae692f37048f7f8b3545ef4f280cd9828852ddbaa06770452d91a42db9",
-                    "nonce" : "0x16d17a0ecb495204",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x74f2fd353c16b3ad964c9772a771a376975fda305fd114a2bbaeabc6ae1af294",
+                    "mixHash" : "0x419a55ec7c85016e792426c6e47a9ad73145276af22f0a0b3a6587f09e1a3421",
+                    "nonce" : "0x6a0526e1054aa99f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x6be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6",
-                    "stateRoot" : "0x00095383f342cebe2c1cc8785cd1d71dc1fd3e307a4cd1950c8aab7fe923fcac",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000095383f342cebe2c1cc8785cd1d71dc1fd3e307a4cd1950c8aab7fe923fcaca0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea06be3e195880b9693ad402936b4b5498cbd4532c5949569a0cc5602368e3580a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f42b8203e880a0607540ae692f37048f7f8b3545ef4f280cd9828852ddbaa06770452d91a42db98816d17a0ecb495204f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0be0441a4f1815e95866442485ce551f1c18fdec01f165309646977e7744b088ea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0419a55ec7c85016e792426c6e47a9ad73145276af22f0a0b3a6587f09e1a3421886a0526e1054aa99ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000641ba0e0f849586fa3ef26acf7669e220c02231c1c6b80cab668b889baf5d34717482da03be99d58c5786aa759e03ed1f71f749d33eeb7ef34f2ce6ef72dcbba2707313fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfba4f667f79962ac88dac700c256eac1623d9a9692522f103c2d8cbaa61da1b4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x74f2fd353c16b3ad964c9772a771a376975fda305fd114a2bbaeabc6ae1af294",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f42b",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0bd5",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json
index 5bd50aca1..88451d408 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d27g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d27g0v0_EIP150" : {
+    "modexp_d27g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d27g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xbe6f",
-                    "hash" : "0xdd55395aa41211da53f5c805e2f014a3c8299139d427cdac22975c16901a3a5f",
-                    "mixHash" : "0x05d2292f9947e05a1eeedcdcb40f970e3b91ca1558a5038d36a1c1a7ccdae081",
-                    "nonce" : "0x5c8dfc027ff37dc1",
+                    "gasUsed" : "0xf94f",
+                    "hash" : "0xf9e75ab934d357974dcae48f2d9214ab04fc78f73581d9dccce45c609f0deb02",
+                    "mixHash" : "0x3f960455d74df31db0e81310aaba7d03d1c598b8ce76a334099d9f1969dcfc80",
+                    "nonce" : "0x2c54cce3f3b8cd44",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
-                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
+                    "receiptTrie" : "0x18b8f046de006f8b8377ce8a016253bfb62bb0a54f687422e5be10f1988296bf",
+                    "stateRoot" : "0x621392aac98ff3ef77c3f0939ce11d911d5a5ee597a23003596972907b24c942",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a005d2292f9947e05a1eeedcdcb40f970e3b91ca1558a5038d36a1c1a7ccdae081885c8dfc027ff37dc1f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0621392aac98ff3ef77c3f0939ce11d911d5a5ee597a23003596972907b24c942a00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a018b8f046de006f8b8377ce8a016253bfb62bb0a54f687422e5be10f1988296bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f94f8203e880a03f960455d74df31db0e81310aaba7d03d1c598b8ce76a334099d9f1969dcfc80882c54cce3f3b8cd44f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd55395aa41211da53f5c805e2f014a3c8299139d427cdac22975c16901a3a5f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf9e75ab934d357974dcae48f2d9214ab04fc78f73581d9dccce45c609f0deb02",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4be6f",
+                "balance" : "0x4563918244f4f94f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4191",
+                "balance" : "0x3635c9adc5de9f06b1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d27g0v0_EIP158" : {
+    "modexp_d27g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d27g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf94f",
+                    "hash" : "0xc49a15b4644bd56f3c7df306211f757ab63ed88b3cc6d5b73ae55b8b48fbcdec",
+                    "mixHash" : "0x461d708d4aa49fbb8b1e5648dd55a656b8f14b174f7200b4a909b9c4d7a19431",
+                    "nonce" : "0xbcafde62d342baf6",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x18b8f046de006f8b8377ce8a016253bfb62bb0a54f687422e5be10f1988296bf",
+                    "stateRoot" : "0x621392aac98ff3ef77c3f0939ce11d911d5a5ee597a23003596972907b24c942",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0621392aac98ff3ef77c3f0939ce11d911d5a5ee597a23003596972907b24c942a00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a018b8f046de006f8b8377ce8a016253bfb62bb0a54f687422e5be10f1988296bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f94f8203e880a0461d708d4aa49fbb8b1e5648dd55a656b8f14b174f7200b4a909b9c4d7a1943188bcafde62d342baf6f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89",
+                        "s" : "0x24fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc49a15b4644bd56f3c7df306211f757ab63ed88b3cc6d5b73ae55b8b48fbcdec",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f94f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f06b1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d27g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d27g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbe6f",
-                    "hash" : "0xd3c567bb6e5ce1a2bd470df4d975ab41852abde04183e5efbcb290785d5dd658",
-                    "mixHash" : "0xa776c49b63c7059cb1f8593a7b52d631a2d6f957e4038fac94404db91dc8c0cd",
-                    "nonce" : "0xca3de1b95cf5987e",
+                    "hash" : "0x8b66d0a0e8c0a1e342a13af641d702c1fe71bb0d0b17bc5f5d60499870d9f1e4",
+                    "mixHash" : "0x81c9899dc0256a07b607fc6fac856728a712db65e5831122fc57e974de3f0845",
+                    "nonce" : "0x83ac4c0960a21204",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a0a776c49b63c7059cb1f8593a7b52d631a2d6f957e4038fac94404db91dc8c0cd88ca3de1b95cf5987ef901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a081c9899dc0256a07b607fc6fac856728a712db65e5831122fc57e974de3f08458883ac4c0960a21204f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3c567bb6e5ce1a2bd470df4d975ab41852abde04183e5efbcb290785d5dd658",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8b66d0a0e8c0a1e342a13af641d702c1fe71bb0d0b17bc5f5d60499870d9f1e4",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d27g0v0_Frontier" : {
+    "modexp_d27g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d27g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x2e49b323dd26de14b75102dbee4350956c5107caa1ac74ed9eca3f5f3ea9ff62",
-                    "mixHash" : "0x38791010b73540bf587982b11080256a9246c9b598b3a26a28c553a5c8e75794",
-                    "nonce" : "0x700baf3065f6f8a3",
+                    "gasUsed" : "0xbe6f",
+                    "hash" : "0x8ee7fdc9065d99fdfe3095e41835501e39567cdd5d7656e9783361e5938b325c",
+                    "mixHash" : "0x183abdc216182f6bfbabfefbe35e0a1b3f83c2a11f0325a603948e6640666bd2",
+                    "nonce" : "0x88c98c2218950a88",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xaf7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177",
+                    "stateRoot" : "0x32dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903ccf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a038791010b73540bf587982b11080256a9246c9b598b3a26a28c553a5c8e7579488700baf3065f6f8a3f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032dfeeb69ddab06efe1fcb5e2a1fa62cdf46f38d7df43c74fc945984611ba54ca00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a0af7245eb1476783e5e241e1fb66ec2d080d84657815ab13309733ee6f2210177b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082be6f8203e880a0183abdc216182f6bfbabfefbe35e0a1b3f83c2a11f0325a603948e6640666bd28888c98c2218950a88f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e49b323dd26de14b75102dbee4350956c5107caa1ac74ed9eca3f5f3ea9ff62",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8ee7fdc9065d99fdfe3095e41835501e39567cdd5d7656e9783361e5938b325c",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4be6f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4191",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d27g0v0_Homestead" : {
+    "modexp_d27g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d27g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x869f5870e516b0027d8d51eb9cbb17ad25334c46cace3c4c4b45b907484e8b7e",
-                    "mixHash" : "0x6b594efefd38bbc3470f6cfc7af9a5b9b1498d823d6fc3589f28877f6fe0e261",
-                    "nonce" : "0x866830644523be7f",
+                    "hash" : "0xb16a24d2ae6e7d189b1536ddc393429b9b9e8d7ddcbec06c252382502acab7b3",
+                    "mixHash" : "0x1573fe33d087e11c94d8660ca7d9a5c67e37fd322fd1640e5e6b7c2919a92d7b",
+                    "nonce" : "0xf9a1e27c2c9bb120",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903ccf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a06b594efefd38bbc3470f6cfc7af9a5b9b1498d823d6fc3589f28877f6fe0e26188866830644523be7ff901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903ccf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a01573fe33d087e11c94d8660ca7d9a5c67e37fd322fd1640e5e6b7c2919a92d7b88f9a1e27c2c9bb120f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x869f5870e516b0027d8d51eb9cbb17ad25334c46cace3c4c4b45b907484e8b7e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb16a24d2ae6e7d189b1536ddc393429b9b9e8d7ddcbec06c252382502acab7b3",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d27g0v0_Metropolis" : {
+    "modexp_d27g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d27g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf94f",
-                    "hash" : "0xec970da4718cc8658464c856eb6185c4c137ab6988025e14ca5c3dc00d519abf",
-                    "mixHash" : "0xb78886bf73925a71f5286446119e797c3966fbfd875e86c1ed11329320929e2e",
-                    "nonce" : "0x96b0eae5508a6ce1",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xe2cfdacc38e376813d73459cce8bb9377c98eed18eb61efe573bf203d53a42c3",
+                    "mixHash" : "0x6fbd57273ff59f011b1f52c0009c3d08cf82858a12ecfd165d9f875eac69d537",
+                    "nonce" : "0x276ba40d2440c7dc",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x18b8f046de006f8b8377ce8a016253bfb62bb0a54f687422e5be10f1988296bf",
-                    "stateRoot" : "0x621392aac98ff3ef77c3f0939ce11d911d5a5ee597a23003596972907b24c942",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903caf901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0621392aac98ff3ef77c3f0939ce11d911d5a5ee597a23003596972907b24c942a00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a018b8f046de006f8b8377ce8a016253bfb62bb0a54f687422e5be10f1988296bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f94f8203e880a0b78886bf73925a71f5286446119e797c3966fbfd875e86c1ed11329320929e2e8896b0eae5508a6ce1f901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
+                "rlp" : "0xf903ccf901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada00fb70f48d1b4f0d2775840bb302e715733af908f38eab368d8212fa2a14558d6a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a06fbd57273ff59f011b1f52c0009c3d08cf82858a12ecfd165d9f875eac69d53788276ba40d2440c7dcf901caf901c780018405f5e10094100000000000000000000000000000000000000080b9016400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300061ba05361c1c6cbc2ba978f988fa5c75720dcd483a6fa87c46f81897fa7333e824b89a024fe194b3c3ab1499cc23bf96993220815b94c5454379370f5bbf057540fe326c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec970da4718cc8658464c856eb6185c4c137ab6988025e14ca5c3dc00d519abf",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe2cfdacc38e376813d73459cce8bb9377c98eed18eb61efe573bf203d53a42c3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f94f",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f06b1",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json
index 8793aeaf1..344c2eebd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d28g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d28g0v0_EIP150" : {
+    "modexp_d28g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d28g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb841",
-                    "hash" : "0x7727d4d2cddc7a536c32fbbb0929d07b1a26c6e414d730b111cf4ceb115512c7",
-                    "mixHash" : "0xb78ed557f4737ad3ef228bcbf9d96129366bfdc85d04e06f7e951deeb319e5fd",
-                    "nonce" : "0xcc07f1cce2ddaf01",
+                    "gasUsed" : "0x05de31f3",
+                    "hash" : "0xf6149be50d4744b15690f61132d4150e84125d78f095cdaafb275addc80b2cb6",
+                    "mixHash" : "0x5caa6c7ca5c9af1414f5bdfc5e4b6bbfec08df47ac89219a2009362bf93f4bfb",
+                    "nonce" : "0x19bf19d0b11e9fcb",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
-                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "receiptTrie" : "0xd9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21f",
+                    "stateRoot" : "0x6e7c5c256f207a5d46fd1012eab44f4d187cce0858c0dbeb747f1b6ebabc73c1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0b78ed557f4737ad3ef228bcbf9d96129366bfdc85d04e06f7e951deeb319e5fd88cc07f1cce2ddaf01f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e7c5c256f207a5d46fd1012eab44f4d187cce0858c0dbeb747f1b6ebabc73c1a096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa0d9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de31f38203e880a05caa6c7ca5c9af1414f5bdfc5e4b6bbfec08df47ac89219a2009362bf93f4bfb8819bf19d0b11e9fcbf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,26 +62,32 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7727d4d2cddc7a536c32fbbb0929d07b1a26c6e414d730b111cf4ceb115512c7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf6149be50d4744b15690f61132d4150e84125d78f095cdaafb275addc80b2cb6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b841",
+                "balance" : "0x456391824ad231f3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f47bf",
+                "balance" : "0x3635c9adc5d8c1ce0d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +111,122 @@
             }
         }
     },
-    "modexp_d28g0v0_EIP158" : {
+    "modexp_d28g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d28g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x05de31f3",
+                    "hash" : "0x8c8d6fb42200adc1a3c63595a7aaae5bc6bfc1da527a3ae194e76f381b4e6365",
+                    "mixHash" : "0xd8bd87113e9cfbe7548c4cc1120c30649dc67aacb9ec232379bdbdd9f7cd3355",
+                    "nonce" : "0x9809998f88886339",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xd9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21f",
+                    "stateRoot" : "0x6e7c5c256f207a5d46fd1012eab44f4d187cce0858c0dbeb747f1b6ebabc73c1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x96a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e7c5c256f207a5d46fd1012eab44f4d187cce0858c0dbeb747f1b6ebabc73c1a096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa0d9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de31f38203e880a0d8bd87113e9cfbe7548c4cc1120c30649dc67aacb9ec232379bdbdd9f7cd3355889809998f88886339f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685",
+                        "s" : "0x0f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2e",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8c8d6fb42200adc1a3c63595a7aaae5bc6bfc1da527a3ae194e76f381b4e6365",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ad231f3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5d8c1ce0d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d28g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d28g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x80d3d2bb50333d59a4e22918a1a5474802eb00e6dcf173c55408df56aec9616c",
-                    "mixHash" : "0xe3937ea54cda382c741a6c37e74c7901a489035a2c7451326f6c8f4e9c6845e0",
-                    "nonce" : "0xc15f25c8394fe41b",
+                    "hash" : "0x1e2236c4373b0c0351d3ced9e9d767ed5db04373839aaee433c4252ac6e63726",
+                    "mixHash" : "0x5bfa987ffb1d53c11f8805b602619f963be553d27434ad262f2dd8fc5eeb9b59",
+                    "nonce" : "0x3b88a19a72831d3f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -131,7 +249,7 @@
                     "transactionsTrie" : "0x96a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0e3937ea54cda382c741a6c37e74c7901a489035a2c7451326f6c8f4e9c6845e088c15f25c8394fe41bf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a05bfa987ffb1d53c11f8805b602619f963be553d27434ad262f2dd8fc5eeb9b59883b88a19a72831d3ff8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -168,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80d3d2bb50333d59a4e22918a1a5474802eb00e6dcf173c55408df56aec9616c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1e2236c4373b0c0351d3ced9e9d767ed5db04373839aaee433c4252ac6e63726",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +329,10 @@
             }
         }
     },
-    "modexp_d28g0v0_Frontier" : {
+    "modexp_d28g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d28g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +343,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x1c67b035407f7bba4f9b200e3c5dcb08400cd8e1204623f3fabb46100ea3539a",
-                    "mixHash" : "0x94839b6a0793197e7f69141a47f403f6045f2f3b52795b2f7d560854cdfce6e3",
-                    "nonce" : "0x0e8ec94f1f9da507",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0xd98029166a5a4ef72c8297026fad35d5969d0eb76be6a487ef7c2a15047b0351",
+                    "mixHash" : "0x624b13e9c3ea13043b75fa4c425a2b314dced9f55798ae1de96b1e0edad93567",
+                    "nonce" : "0x7aa8c6d383222b94",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a094839b6a0793197e7f69141a47f403f6045f2f3b52795b2f7d560854cdfce6e3880e8ec94f1f9da507f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0624b13e9c3ea13043b75fa4c425a2b314dced9f55798ae1de96b1e0edad93567887aa8c6d383222b94f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -274,25 +392,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c67b035407f7bba4f9b200e3c5dcb08400cd8e1204623f3fabb46100ea3539a",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd98029166a5a4ef72c8297026fad35d5969d0eb76be6a487ef7c2a15047b0351",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b841",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f47bf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +435,10 @@
             }
         }
     },
-    "modexp_d28g0v0_Homestead" : {
+    "modexp_d28g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d28g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +450,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xdf7043ebcf32067eecaf8e0fed3c91b94c41696d900a9eafc5abc34a40babeef",
-                    "mixHash" : "0xf31c793583e1922905404ad8b13470d152067d24b8af6d83f6096f467627bdfa",
-                    "nonce" : "0xd5f13afe28ee665a",
+                    "hash" : "0xfd72c0a99a2f4b8769769a3bd366c20eaf8a50539f28be4ed1f98cff990343c5",
+                    "mixHash" : "0xadf730e8144ac79ecfbedf1cfb7c169bbffe8f4cd61484cbfb992ab09bcb72b5",
+                    "nonce" : "0x0efd356689de0c49",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +461,7 @@
                     "transactionsTrie" : "0x96a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f31c793583e1922905404ad8b13470d152067d24b8af6d83f6096f467627bdfa88d5f13afe28ee665af8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0adf730e8144ac79ecfbedf1cfb7c169bbffe8f4cd61484cbfb992ab09bcb72b5880efd356689de0c49f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -379,8 +498,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf7043ebcf32067eecaf8e0fed3c91b94c41696d900a9eafc5abc34a40babeef",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfd72c0a99a2f4b8769769a3bd366c20eaf8a50539f28be4ed1f98cff990343c5",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +540,10 @@
             }
         }
     },
-    "modexp_d28g0v0_Metropolis" : {
+    "modexp_d28g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d28g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +554,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05de31f3",
-                    "hash" : "0x63ba6969484d90d15af8b751cc7f38924581b01682709e967d9836703130899e",
-                    "mixHash" : "0x09805852040a23b25b62d8266e4564e7d80cb52c905254eca5f5da8abe56ec2c",
-                    "nonce" : "0x7ab386a99f9cdfa6",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x69110eddde156e8b97e058d55d91fca295bd2caa2f0ba687413a80b5d68f8e57",
+                    "mixHash" : "0xe81a9c523d706a21e023989070bb54945ed40390944c7737f4b8d47797a9076a",
+                    "nonce" : "0xdb3c646d042a08ab",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xd9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21f",
-                    "stateRoot" : "0x6e7c5c256f207a5d46fd1012eab44f4d187cce0858c0dbeb747f1b6ebabc73c1",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e7c5c256f207a5d46fd1012eab44f4d187cce0858c0dbeb747f1b6ebabc73c1a096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa0d9f286331f4a6a3c498998c6cb32d7f1c34c9a51738a017b620b1d90efbbb21fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de31f38203e880a009805852040a23b25b62d8266e4564e7d80cb52c905254eca5f5da8abe56ec2c887ab386a99f9cdfa6f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada096a0b97bc3e1328b84beeb1bbe36156daf175a38bf9497a3e4a198c084bb089fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0e81a9c523d706a21e023989070bb54945ed40390944c7737f4b8d47797a9076a88db3c646d042a08abf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001ba0860ef002571adc7acba491dadf3e18bd707f4705c735a84860fec2058d3eb685a00f44b537d7ae40e9bd27f3fa300431c4861ddc3fd37aa2086365564318cf9b2ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -484,16 +603,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63ba6969484d90d15af8b751cc7f38924581b01682709e967d9836703130899e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x69110eddde156e8b97e058d55d91fca295bd2caa2f0ba687413a80b5d68f8e57",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -502,14 +614,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad231f3",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8c1ce0d",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
index 2c10e7b81..5a07440cd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d29g0v0_EIP150" : {
+    "modexp_d29g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x44f019a61e37ddedb8e9d7234926f2434ef5d993c49af7b7037ed4eb994b2647",
-                    "mixHash" : "0xbb4e54a4b1a53348190352fd58e6ac13725814dbf187f58ad05745fe7f96d4c7",
-                    "nonce" : "0xa728f0b34190f7fc",
+                    "hash" : "0x966af1c9d9c1983115422d32072871fce75c83044934b8d633c268f4c76a949f",
+                    "mixHash" : "0x57ddbd56ed3f05ca89b80d03ed2816bc2ed4f49af8c311a8972cf49a6a220494",
+                    "nonce" : "0xb88a941eb92e6fa8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
-                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x7923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0bb4e54a4b1a53348190352fd58e6ac13725814dbf187f58ad05745fe7f96d4c788a728f0b34190f7fcf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbca08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a057ddbd56ed3f05ca89b80d03ed2816bc2ed4f49af8c311a8972cf49a6a22049488b88a941eb92e6fa8f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44f019a61e37ddedb8e9d7234926f2434ef5d993c49af7b7037ed4eb994b2647",
-        "network" : "EIP150",
+        "lastblockhash" : "0x966af1c9d9c1983115422d32072871fce75c83044934b8d633c268f4c76a949f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d29g0v0_EIP158" : {
+    "modexp_d29g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x42a52ff4a5f386e11d18633a16f3c0864482593f7cb80a8ab0f61ba3fc9c3fd7",
-                    "mixHash" : "0x2c76221e272261f08814ae7ff2bb32d01e4b0277539880e88b66bca0b1f85483",
-                    "nonce" : "0x9e94acce9b728ff2",
+                    "hash" : "0x80f1dc9863fd9c9ef683e949b00e2d794cfd9cc0b2d1bebedf922e32518a7d4b",
+                    "mixHash" : "0x09582dd55efac88eff4b803e055b32b4bfa88c28e4c901f600663f0ae23d0004",
+                    "nonce" : "0x27f8d75a5c6db444",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x7923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbca08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a009582dd55efac88eff4b803e055b32b4bfa88c28e4c901f600663f0ae23d00048827f8d75a5c6db444f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438",
+                        "s" : "0x6135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x80f1dc9863fd9c9ef683e949b00e2d794cfd9cc0b2d1bebedf922e32518a7d4b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0xc0ce3adf656424676688eec5886611e0b9eef758b73f765c9006b9149b3c8e27",
+                    "mixHash" : "0x8bed1585717e690eede4a138af4179e1a81ee62075ebfa42cfd5180f8dc4b85d",
+                    "nonce" : "0x7ff3912a287fc66b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a02c76221e272261f08814ae7ff2bb32d01e4b0277539880e88b66bca0b1f85483889e94acce9b728ff2f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a08bed1585717e690eede4a138af4179e1a81ee62075ebfa42cfd5180f8dc4b85d887ff3912a287fc66bf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42a52ff4a5f386e11d18633a16f3c0864482593f7cb80a8ab0f61ba3fc9c3fd7",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc0ce3adf656424676688eec5886611e0b9eef758b73f765c9006b9149b3c8e27",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d29g0v0_Frontier" : {
+    "modexp_d29g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd1f264370b2fc39cfe14d038e11518acbc6422a1cdf86c081546d00d951a718a",
-                    "mixHash" : "0xb3c882145c10f9cedfc72ad2391cfa7c0af108da27820c020565c98a694824c5",
-                    "nonce" : "0x9aeb9e46b75f4a5a",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x37dd344f3a64e3d81e4db12c66384ad4885c901d9aa991081f17fbf753028079",
+                    "mixHash" : "0xe9902735514654e66de3a3aed722bc022fc6055ee1f7d96082d663e9b1c3af6d",
+                    "nonce" : "0x468994e019415c8f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b3c882145c10f9cedfc72ad2391cfa7c0af108da27820c020565c98a694824c5889aeb9e46b75f4a5af8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0e9902735514654e66de3a3aed722bc022fc6055ee1f7d96082d663e9b1c3af6d88468994e019415c8ff8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1f264370b2fc39cfe14d038e11518acbc6422a1cdf86c081546d00d951a718a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x37dd344f3a64e3d81e4db12c66384ad4885c901d9aa991081f17fbf753028079",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b841",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f47bf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d29g0v0_Homestead" : {
+    "modexp_d29g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd3f59a7d7282975b622216051ea212bc8ad35590ab56df576820368bd4009811",
-                    "mixHash" : "0x6fb806210190e9d916cba48928981757d5b95dc871ca4160324063e40e09b422",
-                    "nonce" : "0x28edbdc6734432fe",
+                    "hash" : "0xbacfcc72bf808bcb5485bafd68dd5f54f9f296baca5a18ced4d0a0f0594a3715",
+                    "mixHash" : "0xd9d0724a065cbe282f6d2cff0d86db432574839bd1540a7f1f394a3a3439f774",
+                    "nonce" : "0x8ed5d9b4b6db98de",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a06fb806210190e9d916cba48928981757d5b95dc871ca4160324063e40e09b4228828edbdc6734432fef8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d9d0724a065cbe282f6d2cff0d86db432574839bd1540a7f1f394a3a3439f774888ed5d9b4b6db98def8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3f59a7d7282975b622216051ea212bc8ad35590ab56df576820368bd4009811",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbacfcc72bf808bcb5485bafd68dd5f54f9f296baca5a18ced4d0a0f0594a3715",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d29g0v0_Metropolis" : {
+    "modexp_d29g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb841",
-                    "hash" : "0xf07fc488dc11a74fc242490267f3f31dc30f33c267fe45ca201a2f7ec5b88b42",
-                    "mixHash" : "0x4d3e876d54128ed642cb82fa1f155be6befc3401c3c2ff26b1aee82d84515279",
-                    "nonce" : "0x38ffc60105632e17",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x3dbafdcc110e94a8d5451adfdb6bf8e3660adee3e4800953c74a66f4cfd03f3f",
+                    "mixHash" : "0x31ba300075986d2cc611d67509e81e00a7e4600e17c2e26a27e5f0dd402ac67d",
+                    "nonce" : "0xd8f270ef7ef8c1f2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
-                    "stateRoot" : "0x7923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbc",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbca08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a04d3e876d54128ed642cb82fa1f155be6befc3401c3c2ff26b1aee82d845152798838ffc60105632e17f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a031ba300075986d2cc611d67509e81e00a7e4600e17c2e26a27e5f0dd402ac67d88d8f270ef7ef8c1f2f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf07fc488dc11a74fc242490267f3f31dc30f33c267fe45ca201a2f7ec5b88b42",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3dbafdcc110e94a8d5451adfdb6bf8e3660adee3e4800953c74a66f4cfd03f3f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b841",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f47bf",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json
index e019b40b2..6bab140ea 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d2g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d2g0v0_EIP150" : {
+    "modexp_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/stPreCompiledContracts/modexp_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xd1ca",
-                    "hash" : "0x70ef4655bd4ba0a80419779c17af668a08f4f769fedeb6916407ab4a18e626fb",
-                    "mixHash" : "0x50a40fde688c723928cd821f6e25c6e0f7697c4868361a362a05e98650f9088a",
-                    "nonce" : "0xb7cf25d1ef16bc38",
+                    "gasUsed" : "0x05de3259",
+                    "hash" : "0x60b793d747a81f3b7bf04e5b5882f40bbec17085485030e8ad75867b27dffea8",
+                    "mixHash" : "0x4b3e7e3f6dd421d5e375dc0fa10e599c1c626ccd079e20900d7f9672cb36dba4",
+                    "nonce" : "0x531bd8d7f7579fd3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
-                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
+                    "receiptTrie" : "0x86903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fa",
+                    "stateRoot" : "0x883889dc95e6ef51686d669effcb58795e374495ababa3de85fb7d832b85236b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a050a40fde688c723928cd821f6e25c6e0f7697c4868361a362a05e98650f9088a88b7cf25d1ef16bc38f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883889dc95e6ef51686d669effcb58795e374495ababa3de85fb7d832b85236ba0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a086903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de32598203e880a04b3e7e3f6dd421d5e375dc0fa10e599c1c626ccd079e20900d7f9672cb36dba488531bd8d7f7579fd3f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -62,26 +62,32 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70ef4655bd4ba0a80419779c17af668a08f4f769fedeb6916407ab4a18e626fb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x60b793d747a81f3b7bf04e5b5882f40bbec17085485030e8ad75867b27dffea8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d1ca",
+                "balance" : "0x456391824ad23259",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f2e36",
+                "balance" : "0x3635c9adc5d8c1cda7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +111,122 @@
             }
         }
     },
-    "modexp_d2g0v0_EIP158" : {
+    "modexp_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d2g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x05de3259",
+                    "hash" : "0x688e75c4e74911e4bb6390c935879259f0a96ff320ff99b32aae36640a7399cd",
+                    "mixHash" : "0xb450c3104ee6c4ce663aaf05b916f6f091201fa91ea8710cd107b142f72bbbcf",
+                    "nonce" : "0x695e43ff46097970",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x86903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fa",
+                    "stateRoot" : "0x883889dc95e6ef51686d669effcb58795e374495ababa3de85fb7d832b85236b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883889dc95e6ef51686d669effcb58795e374495ababa3de85fb7d832b85236ba0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a086903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de32598203e880a0b450c3104ee6c4ce663aaf05b916f6f091201fa91ea8710cd107b142f72bbbcf88695e43ff46097970f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4f",
+                        "s" : "0x71d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x688e75c4e74911e4bb6390c935879259f0a96ff320ff99b32aae36640a7399cd",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ad23259",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5d8c1cda7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_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/stPreCompiledContracts/modexp_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xd1ca",
-                    "hash" : "0xe6e13885dca90129fde748ee14c02aee9727d5de6a9cdb3275df0129c4f678d4",
-                    "mixHash" : "0x88fc7854a1428f91565504d55dfb2fc9acb6dd1b9ce00a8b72e36e088bff2fee",
-                    "nonce" : "0xb1917c332e902e00",
+                    "hash" : "0x6bb3ebee7e0f8f75a02e264537999b0f962d1f66d714863961b0f14936164d38",
+                    "mixHash" : "0x65ccfcb0ba34dbf25abb7bcfb6bc03df9d40b6fb0cd1083d62305cd182c40f0e",
+                    "nonce" : "0x3ee7b689be6315b6",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
@@ -131,7 +249,7 @@
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a088fc7854a1428f91565504d55dfb2fc9acb6dd1b9ce00a8b72e36e088bff2fee88b1917c332e902e00f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a065ccfcb0ba34dbf25abb7bcfb6bc03df9d40b6fb0cd1083d62305cd182c40f0e883ee7b689be6315b6f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -168,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6e13885dca90129fde748ee14c02aee9727d5de6a9cdb3275df0129c4f678d4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6bb3ebee7e0f8f75a02e264537999b0f962d1f66d714863961b0f14936164d38",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +329,10 @@
             }
         }
     },
-    "modexp_d2g0v0_Frontier" : {
+    "modexp_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/stPreCompiledContracts/modexp_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +343,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x24f331a5147c3503e34cdf2cd7c10db9df13cfa453a3f45b7f0f5b93472dcbf9",
-                    "mixHash" : "0x16f2d051952cad1b95197cd22b352d401627a3f366d7bf2b6fec8fc982eb696b",
-                    "nonce" : "0x49013c8926cdd8cb",
+                    "gasUsed" : "0xd1ca",
+                    "hash" : "0xdfc8f5551527418519b2c10739930e36942fe678f73e394239e0b111dd41a6e9",
+                    "mixHash" : "0xe4a2854e99c89b96c68833ef579b3013b9d0582deeecb80748e0075f3c04b3b6",
+                    "nonce" : "0xc0af9c15593bc985",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x5e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0",
+                    "stateRoot" : "0xa45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a016f2d051952cad1b95197cd22b352d401627a3f366d7bf2b6fec8fc982eb696b8849013c8926cdd8cbf90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90305f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a45dfd5bd904c59f2059fb45f4a0e0407a48f86c16a637d3ea834be91a18928ca0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a05e81d18881ddc94ddbcb843cb981aedbee0e3c58884a7c3aa27cb6cb89a111d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082d1ca8203e880a0e4a2854e99c89b96c68833ef579b3013b9d0582deeecb80748e0075f3c04b3b688c0af9c15593bc985f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -274,25 +392,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24f331a5147c3503e34cdf2cd7c10db9df13cfa453a3f45b7f0f5b93472dcbf9",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdfc8f5551527418519b2c10739930e36942fe678f73e394239e0b111dd41a6e9",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4d1ca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f2e36",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +435,10 @@
             }
         }
     },
-    "modexp_d2g0v0_Homestead" : {
+    "modexp_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/stPreCompiledContracts/modexp_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +450,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x3844a39d82ce000c8a639efb14ebae32ee3a6f21cd2993529c22ddb2361d7e24",
-                    "mixHash" : "0x86c14a052e428b7a0d36558f5deeba5846269d53291cf98b145ce90ca7f0743a",
-                    "nonce" : "0x675815f4bc49c50d",
+                    "hash" : "0xc6168af4c296e4adddeaf613f0b151539a0706aff0cefa36f8d2c5036455096f",
+                    "mixHash" : "0x395dfcef24b35c4ad091a216e0c2718dc9199ddb06e8daae795e521a3237edde",
+                    "nonce" : "0xdc2f2a0d62fb3299",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +461,7 @@
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a086c14a052e428b7a0d36558f5deeba5846269d53291cf98b145ce90ca7f0743a88675815f4bc49c50df90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0395dfcef24b35c4ad091a216e0c2718dc9199ddb06e8daae795e521a3237edde88dc2f2a0d62fb3299f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -379,8 +498,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3844a39d82ce000c8a639efb14ebae32ee3a6f21cd2993529c22ddb2361d7e24",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc6168af4c296e4adddeaf613f0b151539a0706aff0cefa36f8d2c5036455096f",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +540,10 @@
             }
         }
     },
-    "modexp_d2g0v0_Metropolis" : {
+    "modexp_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/stPreCompiledContracts/modexp_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +554,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05de3259",
-                    "hash" : "0x206385b2f16bb81534878112c8832a9f6995b528db8afc591a087ab24ce0ac3d",
-                    "mixHash" : "0x6aab09f8e16a049777ea0be8066f86da0476f1566261660561e4c120eb606fa8",
-                    "nonce" : "0xd432267dbdd49e73",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xed9881dbfedc11b5dcfd792cfe37a18bb45d96f44454eaeef5d1069f81883c03",
+                    "mixHash" : "0xa295890002b69f8475d798a97d73c73cbd23c64ca561fa37ee92c5ca8a8f884a",
+                    "nonce" : "0x540e92df7d97e6fe",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x86903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fa",
-                    "stateRoot" : "0x883889dc95e6ef51686d669effcb58795e374495ababa3de85fb7d832b85236b",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883889dc95e6ef51686d669effcb58795e374495ababa3de85fb7d832b85236ba0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a086903dc3a8e4041f0a05333771042ecbb6210573ecb052c4037fa582936742fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405de32598203e880a06aab09f8e16a049777ea0be8066f86da0476f1566261660561e4c120eb606fa888d432267dbdd49e73f90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
+                "rlp" : "0xf90307f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0ccecb536d5d53e4f5f483d9a6ab0bb20fc994c2a5e7928f44db39704ae402ca5a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0a295890002b69f8475d798a97d73c73cbd23c64ca561fa37ee92c5ca8a8f884a88540e92df7d97e6fef90105f9010280018405f5e10094100000000000000000000000000000000000000080b8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd1ca0512f0fdd08ed0aede023ae3dc151505190e54f441ec6a31fd42eacd011353c4fa071d6fdab9a50e5fe2b167e71bafc85e531195f6a04b4d314fc5c0112d625cd09c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",
@@ -484,16 +603,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x206385b2f16bb81534878112c8832a9f6995b528db8afc591a087ab24ce0ac3d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xed9881dbfedc11b5dcfd792cfe37a18bb45d96f44454eaeef5d1069f81883c03",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -502,14 +614,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad23259",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8c1cda7",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json
index 725683146..3930c1308 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d30g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d30g0v0_EIP150" : {
+    "modexp_d30g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d30g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb8c4",
-                    "hash" : "0x5a705e79a90cab40a471bbd5ac8e0683f52489ced5cd193b20f8f18d522dcfed",
-                    "mixHash" : "0xdbd86edf6f8e7cc5451bce430dd36664983b520d8be7d52ae7a15206cd0ff06a",
-                    "nonce" : "0x0b5b9ea8ffa4bd90",
+                    "hash" : "0xc858dd25f5d3dafe408958657511f36a3952c0ba3c08c5658fab16c9e5e3681a",
+                    "mixHash" : "0xc43fc66edafaf1edeb9add58a24ddcd4528c67ca1b45848060534a4ab1793414",
+                    "nonce" : "0x455e9a27b870a2c1",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
-                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
+                    "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
+                    "stateRoot" : "0x84b86358eaaea304c27228b683c68da99a7e8bf93ec7fd38347dfea1ce158023",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0dbd86edf6f8e7cc5451bce430dd36664983b520d8be7d52ae7a15206cd0ff06a880b5b9ea8ffa4bd90f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084b86358eaaea304c27228b683c68da99a7e8bf93ec7fd38347dfea1ce158023a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0c43fc66edafaf1edeb9add58a24ddcd4528c67ca1b45848060534a4ab179341488455e9a27b870a2c1f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a705e79a90cab40a471bbd5ac8e0683f52489ced5cd193b20f8f18d522dcfed",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc858dd25f5d3dafe408958657511f36a3952c0ba3c08c5658fab16c9e5e3681a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d30g0v0_EIP158" : {
+    "modexp_d30g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d30g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb8c4",
-                    "hash" : "0x0c0c058e8a0ff1211c0a677391cd371a800371ad6455f2e031e49233b852e41d",
-                    "mixHash" : "0x2d6475546d618314822a9c35fc9fb2f377800d6f0b9418a57a5a5251c528e337",
-                    "nonce" : "0xeb259a4cb25c60e1",
+                    "hash" : "0x32a1cc0d38f5ff8a4ac27345a2fbb57cbba5a4e365f4a38d305172679c6dc082",
+                    "mixHash" : "0xafe9eec6e0ded66a5956df0969a9c211b93cfbc5830314d61a4b7935bd93c6c3",
+                    "nonce" : "0x795dcd19e5cdb49b",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
+                    "stateRoot" : "0x84b86358eaaea304c27228b683c68da99a7e8bf93ec7fd38347dfea1ce158023",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084b86358eaaea304c27228b683c68da99a7e8bf93ec7fd38347dfea1ce158023a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0afe9eec6e0ded66a5956df0969a9c211b93cfbc5830314d61a4b7935bd93c6c388795dcd19e5cdb49bf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52",
+                        "s" : "0x655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x32a1cc0d38f5ff8a4ac27345a2fbb57cbba5a4e365f4a38d305172679c6dc082",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b8c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f473c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d30g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d30g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0xcfed2cd650bb98f043bec11ddc8aec654a805653cadac18aed3963d39c6cd567",
+                    "mixHash" : "0x5820dc1dc2cd555ce6b560298f7d038daf15f371850981533c324a616c1f7906",
+                    "nonce" : "0x0835b0bf0de601c8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a02d6475546d618314822a9c35fc9fb2f377800d6f0b9418a57a5a5251c528e33788eb259a4cb25c60e1f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a05820dc1dc2cd555ce6b560298f7d038daf15f371850981533c324a616c1f7906880835b0bf0de601c8f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c0c058e8a0ff1211c0a677391cd371a800371ad6455f2e031e49233b852e41d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcfed2cd650bb98f043bec11ddc8aec654a805653cadac18aed3963d39c6cd567",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d30g0v0_Frontier" : {
+    "modexp_d30g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d30g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xb84ac296e5b9696a2dbad895ad75bd20cad88b999df30e5acb75342b33b11e06",
-                    "mixHash" : "0x0c324082069e479460423a0417617720ab481efbebd24417c35e9d45e8987c33",
-                    "nonce" : "0xfd4f7418c3562220",
+                    "gasUsed" : "0xb8c4",
+                    "hash" : "0x3863d97ae773e472658580efdcf78c2bd7894363b9e4c2ad5d805452891bb6b4",
+                    "mixHash" : "0x584602c2e112b1d434eede4866f339d899c55e8a5714c50cd0e89639e1dc81e9",
+                    "nonce" : "0x2d37ad8d14658411",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x4abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38",
+                    "stateRoot" : "0x81d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a00c324082069e479460423a0417617720ab481efbebd24417c35e9d45e8987c3388fd4f7418c3562220f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081d45ff5cea4806ee7a0a03ff1e3e385e5e255eaa75ad327a8511e1ddcb40fb2a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa04abf9037efc2891a9a9be618572b9c19bef8475ad480f9356fa6c9df87227a38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a0584602c2e112b1d434eede4866f339d899c55e8a5714c50cd0e89639e1dc81e9882d37ad8d14658411f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb84ac296e5b9696a2dbad895ad75bd20cad88b999df30e5acb75342b33b11e06",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3863d97ae773e472658580efdcf78c2bd7894363b9e4c2ad5d805452891bb6b4",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b8c4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f473c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d30g0v0_Homestead" : {
+    "modexp_d30g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d30g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xc958e3f9cf5ec0f973ba145757d559f31babc2168a5f55abc6cd9576da95bd51",
-                    "mixHash" : "0x794225875ab7b24eabdd1ac4f52bf7cf46a3b157b5c9a880ffe4eebe1e84c4c2",
-                    "nonce" : "0x4470faf872f218ee",
+                    "hash" : "0x79ce209501f38eff637166935449d31c20ab5cce76787f27a94089830aa98944",
+                    "mixHash" : "0xda8768c3d18fbb28d9cc17701dfbab5c4d7b4ef3cb5fd391a5e915fbe67c1948",
+                    "nonce" : "0x412e29239c1119c2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0794225875ab7b24eabdd1ac4f52bf7cf46a3b157b5c9a880ffe4eebe1e84c4c2884470faf872f218eef8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0da8768c3d18fbb28d9cc17701dfbab5c4d7b4ef3cb5fd391a5e915fbe67c194888412e29239c1119c2f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc958e3f9cf5ec0f973ba145757d559f31babc2168a5f55abc6cd9576da95bd51",
-        "network" : "Homestead",
+        "lastblockhash" : "0x79ce209501f38eff637166935449d31c20ab5cce76787f27a94089830aa98944",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d30g0v0_Metropolis" : {
+    "modexp_d30g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d30g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb8c4",
-                    "hash" : "0xb38d64534b6ed536061adc5c6e1083a8409887c710d2c1bffca05de27bc37672",
-                    "mixHash" : "0x8791eacb0fa15a896050e3ce260589108bfd8b6582667280b3fad38f1d24551c",
-                    "nonce" : "0x86bd3db52aff0c58",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x9d50dece24f7f85ca649598a5acdda017c5eed3680140fb5f3a93d4340bac2a5",
+                    "mixHash" : "0xb67cf1e50f6f79742d42e665b6c5c54dac9a3c8e5938b6986feee5852349cfb7",
+                    "nonce" : "0xbadc88bbf3a2681b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x9aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5d",
-                    "stateRoot" : "0x84b86358eaaea304c27228b683c68da99a7e8bf93ec7fd38347dfea1ce158023",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084b86358eaaea304c27228b683c68da99a7e8bf93ec7fd38347dfea1ce158023a0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa09aa250ff828888cda3906b79de65c4047947c7dc2d8413bd443c09f4c4f55c5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8c48203e880a08791eacb0fa15a896050e3ce260589108bfd8b6582667280b3fad38f1d24551c8886bd3db52aff0c58f8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
+                "rlp" : "0xf902c5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0f385cb21bdb4afdfd4dc23235862097b0ebe6da2e64e147ad8194e2361a22d7fa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b67cf1e50f6f79742d42e665b6c5c54dac9a3c8e5938b6986feee5852349cfb788badc88bbf3a2681bf8c4f8c280018405f5e10094100000000000000000000000000000000000000080b8600000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ca0c0495d4edb5fc7a940ca20be5519cb479074628ab2529b6f72ae1d3e99974c52a0655c2be2839ebda91b8d1f8efb099035f469f992bee2f934a1d202d386cf0be8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb38d64534b6ed536061adc5c6e1083a8409887c710d2c1bffca05de27bc37672",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9d50dece24f7f85ca649598a5acdda017c5eed3680140fb5f3a93d4340bac2a5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b8c4",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f473c",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json
index c4e61d7da..fa20f6786 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d3g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d3g0v0_EIP150" : {
+    "modexp_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/stPreCompiledContracts/modexp_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xbb1a",
-                    "hash" : "0x81045c2a3d3d1bd900409ba4b0a56b4985bf8f74563a7a0ee2873e15dfc62fbe",
-                    "mixHash" : "0x7e99effff9408a8c740114aa1e935a72cfbd8081b25a0aa0f6ecf7fb37a72ffe",
-                    "nonce" : "0xdffa002019773870",
+                    "gasUsed" : "0xf64b",
+                    "hash" : "0xcf8ff7f57475cba40fdb97278e3b9c07fa3aa0d33b3aff9e8d05a761e6c0afce",
+                    "mixHash" : "0xdef2c213096443b973f2bad45ad6a9ec4555d9cdd9c3d59111d162884a1628ae",
+                    "nonce" : "0x11a0e16b43e24eef",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
-                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
+                    "receiptTrie" : "0xacc4a28fb7c1dc7b6412cb8a3792be38622a6cb5d2203849b38bad916448c188",
+                    "stateRoot" : "0x3d49b616df6a6903e528395d38c4cd5155d4445626edaea692b578b6a8ddad51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a07e99effff9408a8c740114aa1e935a72cfbd8081b25a0aa0f6ecf7fb37a72ffe88dffa002019773870f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d49b616df6a6903e528395d38c4cd5155d4445626edaea692b578b6a8ddad51a0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0acc4a28fb7c1dc7b6412cb8a3792be38622a6cb5d2203849b38bad916448c188b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f64b8203e880a0def2c213096443b973f2bad45ad6a9ec4555d9cdd9c3d59111d162884a1628ae8811a0e16b43e24eeff8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81045c2a3d3d1bd900409ba4b0a56b4985bf8f74563a7a0ee2873e15dfc62fbe",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcf8ff7f57475cba40fdb97278e3b9c07fa3aa0d33b3aff9e8d05a761e6c0afce",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4bb1a",
+                "balance" : "0x4563918244f4f64b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f44e6",
+                "balance" : "0x3635c9adc5de9f09b5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d3g0v0_EIP158" : {
+    "modexp_d3g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d3g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf64b",
+                    "hash" : "0xd216b3a02eb92b1881e7d0539e7603fd6cfba3730d4d6c395441025ee3a7b96e",
+                    "mixHash" : "0x3af7c6d496dc81c1dda5ee0d4df25fbfd013eb4a4adcbe8b12acda6b7fbe25d7",
+                    "nonce" : "0x6de577461e992a7a",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xacc4a28fb7c1dc7b6412cb8a3792be38622a6cb5d2203849b38bad916448c188",
+                    "stateRoot" : "0x3d49b616df6a6903e528395d38c4cd5155d4445626edaea692b578b6a8ddad51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d49b616df6a6903e528395d38c4cd5155d4445626edaea692b578b6a8ddad51a0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0acc4a28fb7c1dc7b6412cb8a3792be38622a6cb5d2203849b38bad916448c188b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f64b8203e880a03af7c6d496dc81c1dda5ee0d4df25fbfd013eb4a4adcbe8b12acda6b7fbe25d7886de577461e992a7af8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5f",
+                        "s" : "0x6d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0e",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd216b3a02eb92b1881e7d0539e7603fd6cfba3730d4d6c395441025ee3a7b96e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f64b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f09b5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_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/stPreCompiledContracts/modexp_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xbb1a",
-                    "hash" : "0xd84dbf7a195189b3a044e8a2908f27880961d84b530a8c6fabfef3d145f4ef0c",
-                    "mixHash" : "0x541de0fbb56ca6f85b3961446dcf574ac90ff1d7f04e6459743c9533d60577f2",
-                    "nonce" : "0x2df540dbb3bc57cd",
+                    "hash" : "0x7e8a63d20226dfb1e4f38920d5a585bdfdcf341ea4f9ce1775208c821c43e739",
+                    "mixHash" : "0xa486109308a59ee20b8991724aa7b996dc8626944860e4282f0359d773848c78",
+                    "nonce" : "0x15164f9522e4fba0",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0541de0fbb56ca6f85b3961446dcf574ac90ff1d7f04e6459743c9533d60577f2882df540dbb3bc57cdf8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a0a486109308a59ee20b8991724aa7b996dc8626944860e4282f0359d773848c788815164f9522e4fba0f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd84dbf7a195189b3a044e8a2908f27880961d84b530a8c6fabfef3d145f4ef0c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7e8a63d20226dfb1e4f38920d5a585bdfdcf341ea4f9ce1775208c821c43e739",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d3g0v0_Frontier" : {
+    "modexp_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/stPreCompiledContracts/modexp_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x025451eb3354273a237a7d6f8673e8b4ad5897f370a4b890221c286a3b4494e0",
-                    "mixHash" : "0xab0bbc54883a5e1837ad99be2b2f0afd4a68015da0323da29ad846b55eb6d677",
-                    "nonce" : "0x74721d4774a8731c",
+                    "gasUsed" : "0xbb1a",
+                    "hash" : "0x4585f9dd2e8ddceb3aafc052cdd3d1d6c99c2d1da039ce30f0be725a169b33de",
+                    "mixHash" : "0x9d4b779298391c084ddada1180712266983c9a51407cd354f257d7edd0be7be8",
+                    "nonce" : "0xe2d2882273196d90",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xb9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294",
+                    "stateRoot" : "0xc840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0ab0bbc54883a5e1837ad99be2b2f0afd4a68015da0323da29ad846b55eb6d6778874721d4774a8731cf8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c840aff87d09a85a352efaf8a24252d712c2fc776377fe646959a824328ebe9fa0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0b9e74615364be9f81ef5d2315f53761c34145cfde15775a01045711647c2b294b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082bb1a8203e880a09d4b779298391c084ddada1180712266983c9a51407cd354f257d7edd0be7be888e2d2882273196d90f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x025451eb3354273a237a7d6f8673e8b4ad5897f370a4b890221c286a3b4494e0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4585f9dd2e8ddceb3aafc052cdd3d1d6c99c2d1da039ce30f0be725a169b33de",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4bb1a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f44e6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d3g0v0_Homestead" : {
+    "modexp_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/stPreCompiledContracts/modexp_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x96ddfb9211cc51a55df0975e3fd838bd4d735341bee10015d931784198249ef8",
-                    "mixHash" : "0x8fcb88bd273cc8bab366caf02bf6f9f5e02230cdc1d81817bef8348478292cd3",
-                    "nonce" : "0x2c1fcf88d257c222",
+                    "hash" : "0x5580dfd931379f24bf94789724c27ad39bf47f8540bcf62a2f064bd628da83c1",
+                    "mixHash" : "0xbb4d00f7886c5df3ee191ca94e34eacbff4e799217550286a1582b8964d4bec3",
+                    "nonce" : "0xb0ed0d0f717107e3",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a08fcb88bd273cc8bab366caf02bf6f9f5e02230cdc1d81817bef8348478292cd3882c1fcf88d257c222f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0bb4d00f7886c5df3ee191ca94e34eacbff4e799217550286a1582b8964d4bec388b0ed0d0f717107e3f8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x96ddfb9211cc51a55df0975e3fd838bd4d735341bee10015d931784198249ef8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5580dfd931379f24bf94789724c27ad39bf47f8540bcf62a2f064bd628da83c1",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d3g0v0_Metropolis" : {
+    "modexp_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/stPreCompiledContracts/modexp_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf64b",
-                    "hash" : "0xb7b274cb9da296acd464318a34a7d737fe9b7e7f94e2797d464c29211140d1a4",
-                    "mixHash" : "0x2d17d0193c7d1008d0d77198f1540fa17cb070096d9ae7470a5a34e3e1a9cebe",
-                    "nonce" : "0xc6f69e0a9373be5b",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xdbd904a9fa51bcab44c61f0b49ca9e3d3463c00305397aceca4a1e6dff301aa6",
+                    "mixHash" : "0x0bc525b8c2ac65d80ae55c778ce6b2d0ebfc76e02279096187f0dcae412de5a2",
+                    "nonce" : "0x373d53f1180b307c",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xacc4a28fb7c1dc7b6412cb8a3792be38622a6cb5d2203849b38bad916448c188",
-                    "stateRoot" : "0x3d49b616df6a6903e528395d38c4cd5155d4445626edaea692b578b6a8ddad51",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d49b616df6a6903e528395d38c4cd5155d4445626edaea692b578b6a8ddad51a0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a0acc4a28fb7c1dc7b6412cb8a3792be38622a6cb5d2203849b38bad916448c188b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f64b8203e880a02d17d0193c7d1008d0d77198f1540fa17cb070096d9ae7470a5a34e3e1a9cebe88c6f69e0a9373be5bf8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
+                "rlp" : "0xf902e9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0dca0c49aef9149f72e76c411b992030ede4bf17be9e1eb3ba5de93074e0b0a99a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a00bc525b8c2ac65d80ae55c778ce6b2d0ebfc76e02279096187f0dcae412de5a288373d53f1180b307cf8e8f8e680018405f5e10094100000000000000000000000000000000000000080b88400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff8000000000000000000000000000000000000000000000000000000000000000071ca0f09c36ec0b88a711947c86a243253f54db4238dcb1f4761b4c62d65235049e5fa06d5583854633dde8ea8162ff551996dac4ca2542313c4facfa450b1651b97d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7b274cb9da296acd464318a34a7d737fe9b7e7f94e2797d464c29211140d1a4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdbd904a9fa51bcab44c61f0b49ca9e3d3463c00305397aceca4a1e6dff301aa6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f64b",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f09b5",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json
index 7a58bc9cb..50aa5388e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d4g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d4g0v0_EIP150" : {
+    "modexp_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/stPreCompiledContracts/modexp_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xba57",
-                    "hash" : "0x8143c67c4a9155560748b996e33d87e36d7ec22b06b90162e89f85d6b9291841",
-                    "mixHash" : "0xfd1b7b09d4f6a1c171d03c95296f6f3b3b75ac4147a7171c49a8eca85f05ee00",
-                    "nonce" : "0x96e904754b676d94",
+                    "gasUsed" : "0xf588",
+                    "hash" : "0x48495679a63abe28c98b4fda662f1e7eb332349b4dbae79b88d25d768b01b320",
+                    "mixHash" : "0x5d7dbec02087fdcb0c888d7820adbd58d12f1eec9b281d3fbee5aba28be3cdf0",
+                    "nonce" : "0xf8af67c0135f8df4",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
-                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
+                    "receiptTrie" : "0x7526c7b2c92711e0d2589184861b35f05be3f12fba762320c76d1ed7feae9fe0",
+                    "stateRoot" : "0x8d94bd93e359fbcf258e7c9a376993fef9a685159982d7b3b6320129f1940c29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a0fd1b7b09d4f6a1c171d03c95296f6f3b3b75ac4147a7171c49a8eca85f05ee008896e904754b676d94f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d94bd93e359fbcf258e7c9a376993fef9a685159982d7b3b6320129f1940c29a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a07526c7b2c92711e0d2589184861b35f05be3f12fba762320c76d1ed7feae9fe0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f5888203e880a05d7dbec02087fdcb0c888d7820adbd58d12f1eec9b281d3fbee5aba28be3cdf088f8af67c0135f8df4f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8143c67c4a9155560748b996e33d87e36d7ec22b06b90162e89f85d6b9291841",
-        "network" : "EIP150",
+        "lastblockhash" : "0x48495679a63abe28c98b4fda662f1e7eb332349b4dbae79b88d25d768b01b320",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba57",
+                "balance" : "0x4563918244f4f588",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f45a9",
+                "balance" : "0x3635c9adc5de9f0a78",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d4g0v0_EIP158" : {
+    "modexp_d4g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d4g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf588",
+                    "hash" : "0x36e36e2f7dfe9b30f43f185ff3ad5caa8a88639118fd58859e2b8d455bdf1398",
+                    "mixHash" : "0xee460a5332f7a10b1c27274110189ee0acd9d45861beb7f7ef091f265d241c29",
+                    "nonce" : "0x19006655412d0447",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x7526c7b2c92711e0d2589184861b35f05be3f12fba762320c76d1ed7feae9fe0",
+                    "stateRoot" : "0x8d94bd93e359fbcf258e7c9a376993fef9a685159982d7b3b6320129f1940c29",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d94bd93e359fbcf258e7c9a376993fef9a685159982d7b3b6320129f1940c29a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a07526c7b2c92711e0d2589184861b35f05be3f12fba762320c76d1ed7feae9fe0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f5888203e880a0ee460a5332f7a10b1c27274110189ee0acd9d45861beb7f7ef091f265d241c298819006655412d0447f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624",
+                        "s" : "0x70c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x36e36e2f7dfe9b30f43f185ff3ad5caa8a88639118fd58859e2b8d455bdf1398",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f588",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0a78",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_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/stPreCompiledContracts/modexp_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba57",
-                    "hash" : "0xbc428df34f5cc37989602470fe0967acda74d373676516f4142cf48fb74d9cbf",
-                    "mixHash" : "0x80c0cbd0ad98e55c8f1d8cf9d45aa8562f3f4c5726f36c7bc6976d00ea401646",
-                    "nonce" : "0xb64307dbe08a3850",
+                    "hash" : "0x309c1e41e3126ad9401b9a23289e8d1b1ee8cdcce34b34f00ce018f71a086b70",
+                    "mixHash" : "0x6ccc40013b0539f6e518a5a84af70216aca422fe1ad3ec7168cee4618c3bede3",
+                    "nonce" : "0xdad4dd652f804603",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a080c0cbd0ad98e55c8f1d8cf9d45aa8562f3f4c5726f36c7bc6976d00ea40164688b64307dbe08a3850f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a06ccc40013b0539f6e518a5a84af70216aca422fe1ad3ec7168cee4618c3bede388dad4dd652f804603f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc428df34f5cc37989602470fe0967acda74d373676516f4142cf48fb74d9cbf",
-        "network" : "EIP158",
+        "lastblockhash" : "0x309c1e41e3126ad9401b9a23289e8d1b1ee8cdcce34b34f00ce018f71a086b70",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d4g0v0_Frontier" : {
+    "modexp_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/stPreCompiledContracts/modexp_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd48d1c0dfc5cfb27edf1cce27db0e3ffb82bc2e728e756865c7ef2218cd7d3f6",
-                    "mixHash" : "0x54aff1fcc0163bd0fd2a04bd8076250c7bfe670b70c12c23310756fcf8a0497c",
-                    "nonce" : "0x7f90077431a9b4c5",
+                    "gasUsed" : "0xba57",
+                    "hash" : "0xeb26d58c15dc03172427b710eaa230f01bacf43c4da6c00ab21a9b07d45cc58b",
+                    "mixHash" : "0x4575c2a36b3b542627ca5ad76b9631c6866967eaa6e77a6c71532b9939a8d641",
+                    "nonce" : "0xbc1f791376129532",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x4f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0",
+                    "stateRoot" : "0xe73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a054aff1fcc0163bd0fd2a04bd8076250c7bfe670b70c12c23310756fcf8a0497c887f90077431a9b4c5f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e73a1edd02bcdfa80037ab0f642ea2eeb1be14f89253eecc5f2bfbc07bbe9eb1a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a04f9dbeac0eb058924e112654ecf53b10364b53c29a046b9ca929a121e12d08b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba578203e880a04575c2a36b3b542627ca5ad76b9631c6866967eaa6e77a6c71532b9939a8d64188bc1f791376129532f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd48d1c0dfc5cfb27edf1cce27db0e3ffb82bc2e728e756865c7ef2218cd7d3f6",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeb26d58c15dc03172427b710eaa230f01bacf43c4da6c00ab21a9b07d45cc58b",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ba57",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f45a9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d4g0v0_Homestead" : {
+    "modexp_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/stPreCompiledContracts/modexp_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xe8b298f3122594a695b07bc10d8bc778bd1f98f727f8221e946a566c2d01cc7a",
-                    "mixHash" : "0xbc90f7d67e5ca8644df1e8a28e51ef1486f550bebe00b2ac2f5fc41e21112db1",
-                    "nonce" : "0xb5a4de5f29a97808",
+                    "hash" : "0x4710d29b148e6ad4a7a1e037aa4fdfc24a7d361c3dac3b4c96b4071f8a4b2cf0",
+                    "mixHash" : "0x086504c3547b15a6455bc0dc4244af45a95aff46aca1256973221093a46c23f9",
+                    "nonce" : "0xd2fc01718447b352",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0bc90f7d67e5ca8644df1e8a28e51ef1486f550bebe00b2ac2f5fc41e21112db188b5a4de5f29a97808f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0086504c3547b15a6455bc0dc4244af45a95aff46aca1256973221093a46c23f988d2fc01718447b352f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8b298f3122594a695b07bc10d8bc778bd1f98f727f8221e946a566c2d01cc7a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4710d29b148e6ad4a7a1e037aa4fdfc24a7d361c3dac3b4c96b4071f8a4b2cf0",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d4g0v0_Metropolis" : {
+    "modexp_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/stPreCompiledContracts/modexp_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf588",
-                    "hash" : "0xe0a98de432e9c8a248d3555ab122561166413ecc821def2400fc517aa96be2fa",
-                    "mixHash" : "0x4b0a6ccb1a65116596fa6bd172c32108e4bad10c0fbee8de22548c8b953950f5",
-                    "nonce" : "0xb2ec5e9caeec2d13",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x79344cda2929f8a7b9ed9b8cae3a612194ee1846b02648e5eb094a0be163cc16",
+                    "mixHash" : "0x20c587b6f240be05939821003ac61320e844e492795a39125df84b11659b7628",
+                    "nonce" : "0xc1a1eaf7ecc387ee",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x7526c7b2c92711e0d2589184861b35f05be3f12fba762320c76d1ed7feae9fe0",
-                    "stateRoot" : "0x8d94bd93e359fbcf258e7c9a376993fef9a685159982d7b3b6320129f1940c29",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d94bd93e359fbcf258e7c9a376993fef9a685159982d7b3b6320129f1940c29a05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a07526c7b2c92711e0d2589184861b35f05be3f12fba762320c76d1ed7feae9fe0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f5888203e880a04b0a6ccb1a65116596fa6bd172c32108e4bad10c0fbee8de22548c8b953950f588b2ec5e9caeec2d13f8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
+                "rlp" : "0xf902c9f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada05b9ab35a217d4e0684d39d310aa3e9023d639ca226fdbab8cdd8280cd5f134d0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a020c587b6f240be05939821003ac61320e844e492795a39125df84b11659b762888c1a1eaf7ecc387eef8c8f8c680018405f5e10094100000000000000000000000000000000000000080b86400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff801ba0bd910b9a06caf551c485e603cd8f82d3ee4b9e622e6103e9a5bed6e65c18b624a070c4be252365288585cf0758f00547eedca4decde9fd455dc32bafd908a0dca4c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0a98de432e9c8a248d3555ab122561166413ecc821def2400fc517aa96be2fa",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x79344cda2929f8a7b9ed9b8cae3a612194ee1846b02648e5eb094a0be163cc16",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f588",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0a78",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json
index 1a5e068da..6bca1671e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d5g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d5g0v0_EIP150" : {
+    "modexp_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/stPreCompiledContracts/modexp_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb98b",
-                    "hash" : "0x1e8734a32b16c2ec6e10af72f5f262fe6d36466f9de6ac1bb56b4907091e3ca1",
-                    "mixHash" : "0x4a86536279b7538f1283799c9a6c9ef486d9d55a16fd198424236710fdb6d4cb",
-                    "nonce" : "0xbd385e09125ff2a6",
+                    "gasUsed" : "0xb995",
+                    "hash" : "0xe4717a17a1f212cfafb84c832897b81049af4531a48c8213072cdb6f882d0ddc",
+                    "mixHash" : "0x8995a361e0726da080a4ed09e6a751d7d71b04bce9350e55c0d70418f4906964",
+                    "nonce" : "0xcdf7d400abdf115d",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
-                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
+                    "receiptTrie" : "0x74c75a131d97e397760e9a2f64d8c01f8063f2878ae3e7d64a7146cf95397958",
+                    "stateRoot" : "0x55aa57957986f77c865f86237192634dcffe5cd3f6df374f14e955cc24751dd1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a04a86536279b7538f1283799c9a6c9ef486d9d55a16fd198424236710fdb6d4cb88bd385e09125ff2a6f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055aa57957986f77c865f86237192634dcffe5cd3f6df374f14e955cc24751dd1a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa074c75a131d97e397760e9a2f64d8c01f8063f2878ae3e7d64a7146cf95397958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9958203e880a08995a361e0726da080a4ed09e6a751d7d71b04bce9350e55c0d70418f490696488cdf7d400abdf115df8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e8734a32b16c2ec6e10af72f5f262fe6d36466f9de6ac1bb56b4907091e3ca1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe4717a17a1f212cfafb84c832897b81049af4531a48c8213072cdb6f882d0ddc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b98b",
+                "balance" : "0x4563918244f4b995",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4675",
+                "balance" : "0x3635c9adc5de9f466b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,123 @@
             }
         }
     },
-    "modexp_d5g0v0_EIP158" : {
+    "modexp_d5g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d5g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb995",
+                    "hash" : "0x2041a4f371ab16f410c644821e4ec56cfcd4509c1b945cb955f7192813f6fc95",
+                    "mixHash" : "0xd7ff2bb5822ae9f3ddb68f84e92478a955a59c12cad81843b20331aacfa0d2b8",
+                    "nonce" : "0x5bf6898db829b208",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x74c75a131d97e397760e9a2f64d8c01f8063f2878ae3e7d64a7146cf95397958",
+                    "stateRoot" : "0x55aa57957986f77c865f86237192634dcffe5cd3f6df374f14e955cc24751dd1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055aa57957986f77c865f86237192634dcffe5cd3f6df374f14e955cc24751dd1a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa074c75a131d97e397760e9a2f64d8c01f8063f2878ae3e7d64a7146cf95397958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9958203e880a0d7ff2bb5822ae9f3ddb68f84e92478a955a59c12cad81843b20331aacfa0d2b8885bf6898db829b208f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0",
+                        "s" : "0x7a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9d",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2041a4f371ab16f410c644821e4ec56cfcd4509c1b945cb955f7192813f6fc95",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b995",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f466b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d5g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98b",
-                    "hash" : "0x07c6d4a14a45b2b231e0568ac4e31ed808944d0b82f578ce3bd883f8f9d5591e",
-                    "mixHash" : "0x79892ee32e269141712d946cf1b9074371a6066587b559b3b52430662c11ef49",
-                    "nonce" : "0x0c24feb6b0f94e14",
+                    "hash" : "0x75be929dcb43e638bb0c51394e60657ec3a714b4b7913a0d564994bcd76a056f",
+                    "mixHash" : "0x05f760a72fadbdf8edfd29c351ec20b929dc7c1f6a579a233fb5a0c4cbcb05e7",
+                    "nonce" : "0x78fbd7e9ac55ced9",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a079892ee32e269141712d946cf1b9074371a6066587b559b3b52430662c11ef49880c24feb6b0f94e14f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a005f760a72fadbdf8edfd29c351ec20b929dc7c1f6a579a233fb5a0c4cbcb05e78878fbd7e9ac55ced9f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07c6d4a14a45b2b231e0568ac4e31ed808944d0b82f578ce3bd883f8f9d5591e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x75be929dcb43e638bb0c51394e60657ec3a714b4b7913a0d564994bcd76a056f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d5g0v0_Frontier" : {
+    "modexp_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/stPreCompiledContracts/modexp_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x3da31ff01692067662987269040ed5d85e7cb4e5e3caf24863ef9c2e068315cf",
-                    "mixHash" : "0x3d0f8d4e23c8523db749a510ea6b2d4ded2e11d7edcf07296ad227795717031e",
-                    "nonce" : "0xb82108e308d79a0b",
+                    "gasUsed" : "0xb98b",
+                    "hash" : "0x792d4e8543498e33ce2b950a8ce7105ce19d5b9b23de89e71983a22b4a6c44f7",
+                    "mixHash" : "0x44ec7e9b259081216cbce50ece7a59243cb207702ec126443a3c015c5a1af2e9",
+                    "nonce" : "0x778605572382ce58",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995",
+                    "stateRoot" : "0xf5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a03d0f8d4e23c8523db749a510ea6b2d4ded2e11d7edcf07296ad227795717031e88b82108e308d79a0bf8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5919a219f4eb55b969295a6b8227aaa2494bdc9783ac95e23bc41a796b7f573a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa0ace22c33cab1e0f1e302f8ab3292f4a7c7f73a271bed10bb749205266079c995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98b8203e880a044ec7e9b259081216cbce50ece7a59243cb207702ec126443a3c015c5a1af2e988778605572382ce58f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3da31ff01692067662987269040ed5d85e7cb4e5e3caf24863ef9c2e068315cf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x792d4e8543498e33ce2b950a8ce7105ce19d5b9b23de89e71983a22b4a6c44f7",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b98b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4675",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d5g0v0_Homestead" : {
+    "modexp_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/stPreCompiledContracts/modexp_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x02284da2f784b6c985a2acefd64d074fa1e17f8c62a7258bcb9a00e5ef375674",
-                    "mixHash" : "0xb485c00e476951a9e756d47f2b6f46b09e50bb3443d58c32f7fc6ed6289566c6",
-                    "nonce" : "0x6e0d352f5aabe7c7",
+                    "hash" : "0x9a953ca61e438399555e664cc31279635195d65154e71378f41fb2374d2bca8b",
+                    "mixHash" : "0xe18873bd92fec3fba26b6fb6007da7b3bef9943a99120ce228c625dd117e3b66",
+                    "nonce" : "0xece498a5e4291500",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b485c00e476951a9e756d47f2b6f46b09e50bb3443d58c32f7fc6ed6289566c6886e0d352f5aabe7c7f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0e18873bd92fec3fba26b6fb6007da7b3bef9943a99120ce228c625dd117e3b6688ece498a5e4291500f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02284da2f784b6c985a2acefd64d074fa1e17f8c62a7258bcb9a00e5ef375674",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9a953ca61e438399555e664cc31279635195d65154e71378f41fb2374d2bca8b",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d5g0v0_Metropolis" : {
+    "modexp_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/stPreCompiledContracts/modexp_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb995",
-                    "hash" : "0xe412e7b50e7db43b051076bf03fe4e4882141dd8d08656b6d5cbbed71551635c",
-                    "mixHash" : "0xbea4ae1969d64850d73eb8dc550541c73eeece72cd8a0b57be3b6bbba9bb4b7e",
-                    "nonce" : "0x9d0db2f40ae99add",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xad0b30fc536fc434b2bae957ec6f88dd1f349b025a917000fd907ce3c766902c",
+                    "mixHash" : "0x7fe358f666e000275716449811bc53327c383a9629e89b2bb66ba706d1e3c23f",
+                    "nonce" : "0x796889edebe4f4c2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x74c75a131d97e397760e9a2f64d8c01f8063f2878ae3e7d64a7146cf95397958",
-                    "stateRoot" : "0x55aa57957986f77c865f86237192634dcffe5cd3f6df374f14e955cc24751dd1",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70af",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055aa57957986f77c865f86237192634dcffe5cd3f6df374f14e955cc24751dd1a0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa074c75a131d97e397760e9a2f64d8c01f8063f2878ae3e7d64a7146cf95397958b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9958203e880a0bea4ae1969d64850d73eb8dc550541c73eeece72cd8a0b57be3b6bbba9bb4b7e889d0db2f40ae99addf8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
+                "rlp" : "0xf902c6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0e5d4c2515348e5b8f86cfa2698f7f2e75f1ee457c46bba8f2b2ae3c671fe70afa08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a07fe358f666e000275716449811bc53327c383a9629e89b2bb66ba706d1e3c23f88796889edebe4f4c2f8c5f8c380018405f5e10094100000000000000000000000000000000000000080b861000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020031ba09ab37cebbfefdf51ccd9bfa5441045c3cf083563b0950428eb5b78a9a1ad39b0a07a6537f70757fe223939acbdc9d1efc0a46fc44349554a838487bea4edbf6b9dc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe412e7b50e7db43b051076bf03fe4e4882141dd8d08656b6d5cbbed71551635c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xad0b30fc536fc434b2bae957ec6f88dd1f349b025a917000fd907ce3c766902c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b995",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f466b",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json
index 91661b92e..97c168c50 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d6g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d6g0v0_EIP150" : {
+    "modexp_d6g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d6g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xba0e",
-                    "hash" : "0xe50f0ca65e13cc1b0df1a9b488732248948fba1ccb0f1a64adff4d41857682f9",
-                    "mixHash" : "0xba106686e0987c0206e2c447f6c1a11627fd9a54a2819c8dce6d7a7eabbee02d",
-                    "nonce" : "0x1b224955d55a0f9a",
+                    "gasUsed" : "0xf4b0",
+                    "hash" : "0x9f9c0f8905d212ae31184acd123e4b1b24ed20fed388f560512c6d09ac4cc536",
+                    "mixHash" : "0x4b64b9d07fc5e662188a010ba6e5cc58bc70e4b25ad67056b154a890d84488b1",
+                    "nonce" : "0x56da7d96e620d386",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
-                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
+                    "receiptTrie" : "0x5ae422a6f09bcbf05af174e0efbad845da15dcb6b087761e73f0aa5d418a2229",
+                    "stateRoot" : "0x06ebe7a99fbfe83e6a8c47a954204d8bbc1b31f243bd8495028461af653965d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0ba106686e0987c0206e2c447f6c1a11627fd9a54a2819c8dce6d7a7eabbee02d881b224955d55a0f9af8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ebe7a99fbfe83e6a8c47a954204d8bbc1b31f243bd8495028461af653965d6a09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a05ae422a6f09bcbf05af174e0efbad845da15dcb6b087761e73f0aa5d418a2229b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4b08203e880a04b64b9d07fc5e662188a010ba6e5cc58bc70e4b25ad67056b154a890d84488b18856da7d96e620d386f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe50f0ca65e13cc1b0df1a9b488732248948fba1ccb0f1a64adff4d41857682f9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9f9c0f8905d212ae31184acd123e4b1b24ed20fed388f560512c6d09ac4cc536",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba0e",
+                "balance" : "0x4563918244f4f4b0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f45f2",
+                "balance" : "0x3635c9adc5de9f0b50",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d6g0v0_EIP158" : {
+    "modexp_d6g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d6g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf4b0",
+                    "hash" : "0xe06d67bf4df86a247b72419b91fd0d7c7859b88c9d53f119c8bdef13d83a2e93",
+                    "mixHash" : "0x6952d3b3a229133031ac21a6632195229c2738e2254d849902e61dd8b80c7d2c",
+                    "nonce" : "0x1718ab5bb786565f",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x5ae422a6f09bcbf05af174e0efbad845da15dcb6b087761e73f0aa5d418a2229",
+                    "stateRoot" : "0x06ebe7a99fbfe83e6a8c47a954204d8bbc1b31f243bd8495028461af653965d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ebe7a99fbfe83e6a8c47a954204d8bbc1b31f243bd8495028461af653965d6a09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a05ae422a6f09bcbf05af174e0efbad845da15dcb6b087761e73f0aa5d418a2229b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4b08203e880a06952d3b3a229133031ac21a6632195229c2738e2254d849902e61dd8b80c7d2c881718ab5bb786565ff8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3c",
+                        "s" : "0x4b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe06d67bf4df86a247b72419b91fd0d7c7859b88c9d53f119c8bdef13d83a2e93",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f4b0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0b50",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d6g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d6g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xba0e",
-                    "hash" : "0x6bd05b5eeed9d6ee872dcced7c41451f3e2f499cd22dda62127c4d2bba100284",
-                    "mixHash" : "0x7aba81f323db6a627ee51f3cb49900a500b581dd15b4fb4bcc509ce91fe00b2f",
-                    "nonce" : "0x9ce57e7a6ca95192",
+                    "hash" : "0x670f9e168ef2103bec2ebecad84e63153e05599d75436479e260fc6c2dedcf63",
+                    "mixHash" : "0xa772dda043582d12de34c54d45233e32122f6a72e07b93690b149741787b9ff8",
+                    "nonce" : "0xfa653d689f991bba",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a07aba81f323db6a627ee51f3cb49900a500b581dd15b4fb4bcc509ce91fe00b2f889ce57e7a6ca95192f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a0a772dda043582d12de34c54d45233e32122f6a72e07b93690b149741787b9ff888fa653d689f991bbaf8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bd05b5eeed9d6ee872dcced7c41451f3e2f499cd22dda62127c4d2bba100284",
-        "network" : "EIP158",
+        "lastblockhash" : "0x670f9e168ef2103bec2ebecad84e63153e05599d75436479e260fc6c2dedcf63",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d6g0v0_Frontier" : {
+    "modexp_d6g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d6g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x415fc4da66d25d9d8a2bb131e69ff069ec8c5816e961214ad0ffcbc662fbc4c2",
-                    "mixHash" : "0x07fce9dcc94fd5eb37439226f07c563ce8287e56d0661ca201fafd68a8d24886",
-                    "nonce" : "0x198623d1d10c951f",
+                    "gasUsed" : "0xba0e",
+                    "hash" : "0x8de18932323884e64747ef2d6d1214976737280a3104e085014561ecdeb57a00",
+                    "mixHash" : "0x3877617dfb0bb0b6fa87572d8f11a8565904e30a0d01fa0e4f58434abddc60d4",
+                    "nonce" : "0x0c0fac66a124448a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xe75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084",
+                    "stateRoot" : "0xad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a007fce9dcc94fd5eb37439226f07c563ce8287e56d0661ca201fafd68a8d2488688198623d1d10c951ff8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad7a4d30a55b4aa34d2fd06937320b658f40a301e04a5374befeb45742e0828fa09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a0e75be5afcbc4a7e64a9298601c72d0428e1b6527d933ee9c1514560c8f096084b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082ba0e8203e880a03877617dfb0bb0b6fa87572d8f11a8565904e30a0d01fa0e4f58434abddc60d4880c0fac66a124448af8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x415fc4da66d25d9d8a2bb131e69ff069ec8c5816e961214ad0ffcbc662fbc4c2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8de18932323884e64747ef2d6d1214976737280a3104e085014561ecdeb57a00",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4ba0e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f45f2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d6g0v0_Homestead" : {
+    "modexp_d6g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d6g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xbe174a03dce02aa72c2f181dbdc431ce96f0a40c57a4f848f09927620951b9df",
-                    "mixHash" : "0xf13111877dda03e67acd12c3f7da324d983615dbf33d500dec24a2a8e3696f48",
-                    "nonce" : "0x369b4098e2c14249",
+                    "hash" : "0x86fbcc0dc3cb714be413ecb07ae8070ad9ede6361cf37ca1921b605c7297e4b6",
+                    "mixHash" : "0xceb6a9d110a5db23a082dfa03df8eb7118b5b2d99e0136721b83139bccbbd38f",
+                    "nonce" : "0x0f87e4d93e72d6b4",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f13111877dda03e67acd12c3f7da324d983615dbf33d500dec24a2a8e3696f4888369b4098e2c14249f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0ceb6a9d110a5db23a082dfa03df8eb7118b5b2d99e0136721b83139bccbbd38f880f87e4d93e72d6b4f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe174a03dce02aa72c2f181dbdc431ce96f0a40c57a4f848f09927620951b9df",
-        "network" : "Homestead",
+        "lastblockhash" : "0x86fbcc0dc3cb714be413ecb07ae8070ad9ede6361cf37ca1921b605c7297e4b6",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d6g0v0_Metropolis" : {
+    "modexp_d6g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d6g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf4b0",
-                    "hash" : "0xdb86295d0427cc57f6d9951dc34a1fd8e4bc344392ccdd37a37019b78609f978",
-                    "mixHash" : "0x61d9716e437158dd27fd1c4d0567313ba2e80aa9527d7fcbb62d19de81d1c2b4",
-                    "nonce" : "0xc0a0ea3f05cb39a5",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x46f741a3d1fd7e77232db97ac26941aa3297fb3bc03a0241f94dca29429dc116",
+                    "mixHash" : "0x1028cc5a15f03fb2f24902adaab551492d23c71779404b80d01aa6c514332fd9",
+                    "nonce" : "0x6bf605ad1aa52ded",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x5ae422a6f09bcbf05af174e0efbad845da15dcb6b087761e73f0aa5d418a2229",
-                    "stateRoot" : "0x06ebe7a99fbfe83e6a8c47a954204d8bbc1b31f243bd8495028461af653965d6",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e4f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ebe7a99fbfe83e6a8c47a954204d8bbc1b31f243bd8495028461af653965d6a09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a05ae422a6f09bcbf05af174e0efbad845da15dcb6b087761e73f0aa5d418a2229b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4b08203e880a061d9716e437158dd27fd1c4d0567313ba2e80aa9527d7fcbb62d19de81d1c2b488c0a0ea3f05cb39a5f8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
+                "rlp" : "0xf902e6f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09bad6bc8de3e83556b5fa9b5e4244696ec04c75120fc5c3821e5be93302491c1a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a01028cc5a15f03fb2f24902adaab551492d23c71779404b80d01aa6c514332fd9886bf605ad1aa52dedf8e5f8e380018405f5e10094100000000000000000000000000000000000000080b8810000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200380000000000000000000000000000000000000000000000000000000000000001ca04bb9bb0275cafac4715fcacc277ef3a08c48ef04ba9b8bd5565f7a6c03befa3ca04b7c5270a1ff0b0cf623f66070cc250792c02106b721a5c96d28283f61a97b1cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb86295d0427cc57f6d9951dc34a1fd8e4bc344392ccdd37a37019b78609f978",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x46f741a3d1fd7e77232db97ac26941aa3297fb3bc03a0241f94dca29429dc116",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f4b0",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0b50",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json
index 859f83f0c..c2f02d9b8 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d7g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d7g0v0_EIP150" : {
+    "modexp_d7g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d7g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb993",
-                    "hash" : "0x903c64ce2453cf649b74adc2f23921ad33f12a7b87c4764e5b49feae7c81150f",
-                    "mixHash" : "0x17129c054882f1bdbf0226b68a1d610a802f01e983c7086387ff15084641e820",
-                    "nonce" : "0x1021f62b241dabce",
+                    "gasUsed" : "0xf435",
+                    "hash" : "0x86b578c46d9dc99fa0162a091c59dac50dbfa8cce3d209b3f2122d1570289092",
+                    "mixHash" : "0x4b27fb9663213e19a163dbfca2cf9e71a6582fd397bf983a48fdd1d2b0cc18b3",
+                    "nonce" : "0x2e7063f3ac0e4825",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
-                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
+                    "receiptTrie" : "0x02c7be4cd6abf077f21bcc3f9c283c02010ca68f2e34880a52048fcc909dd0d5",
+                    "stateRoot" : "0x45a87afd9ff37dec359220b229d0f3e62b71c709fd78c9956d8b68d06d754a42",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a017129c054882f1bdbf0226b68a1d610a802f01e983c7086387ff15084641e820881021f62b241dabcef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a87afd9ff37dec359220b229d0f3e62b71c709fd78c9956d8b68d06d754a42a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea002c7be4cd6abf077f21bcc3f9c283c02010ca68f2e34880a52048fcc909dd0d5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4358203e880a04b27fb9663213e19a163dbfca2cf9e71a6582fd397bf983a48fdd1d2b0cc18b3882e7063f3ac0e4825f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -62,26 +62,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x903c64ce2453cf649b74adc2f23921ad33f12a7b87c4764e5b49feae7c81150f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x86b578c46d9dc99fa0162a091c59dac50dbfa8cce3d209b3f2122d1570289092",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b993",
+                "balance" : "0x4563918244f4f435",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f466d",
+                "balance" : "0x3635c9adc5de9f0bcb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +113,124 @@
             }
         }
     },
-    "modexp_d7g0v0_EIP158" : {
+    "modexp_d7g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d7g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xf435",
+                    "hash" : "0xb043e623b9ec4b3e50479e73f78673a7b939605d794847e66ccd3d04cabbe600",
+                    "mixHash" : "0x16c2dbf7e3a9179982ab1e6eff15d2688483b7dc977d2f1ca88d204368eb337b",
+                    "nonce" : "0xcfd3bb11964632f2",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x02c7be4cd6abf077f21bcc3f9c283c02010ca68f2e34880a52048fcc909dd0d5",
+                    "stateRoot" : "0x45a87afd9ff37dec359220b229d0f3e62b71c709fd78c9956d8b68d06d754a42",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a87afd9ff37dec359220b229d0f3e62b71c709fd78c9956d8b68d06d754a42a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea002c7be4cd6abf077f21bcc3f9c283c02010ca68f2e34880a52048fcc909dd0d5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4358203e880a016c2dbf7e3a9179982ab1e6eff15d2688483b7dc977d2f1ca88d204368eb337b88cfd3bb11964632f2f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807e",
+                        "s" : "0x0a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb043e623b9ec4b3e50479e73f78673a7b939605d794847e66ccd3d04cabbe600",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f435",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f0bcb",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d7g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d7g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb993",
-                    "hash" : "0x47c494a89eabb71bc6b4fe4438d539853324419d049ef2f19aa87c148e497588",
-                    "mixHash" : "0xe716c709a6902c1e3ffff2c3af243aae6e7504223653720ba9e7ef1e18ce7bcf",
-                    "nonce" : "0xcc985f8a701639a2",
+                    "hash" : "0x2975d4cde51accbccf4ae1c6aa554622564c07cbe9737fa2bc523dc2823e2da3",
+                    "mixHash" : "0x48153147aacb8f22c68e662312ca2194369bf981364e7631fbec4fdd10d7e0dc",
+                    "nonce" : "0x663c837fe5f4a10a",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
@@ -131,7 +253,7 @@
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a0e716c709a6902c1e3ffff2c3af243aae6e7504223653720ba9e7ef1e18ce7bcf88cc985f8a701639a2f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a048153147aacb8f22c68e662312ca2194369bf981364e7631fbec4fdd10d7e0dc88663c837fe5f4a10af8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -168,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47c494a89eabb71bc6b4fe4438d539853324419d049ef2f19aa87c148e497588",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2975d4cde51accbccf4ae1c6aa554622564c07cbe9737fa2bc523dc2823e2da3",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +333,10 @@
             }
         }
     },
-    "modexp_d7g0v0_Frontier" : {
+    "modexp_d7g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d7g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +347,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xc8c2e796f9757d12a47ec5842ba6f946ca64180568f9daf6ba626c86ffdcb099",
-                    "mixHash" : "0xb071da05e1dc0f503776529c8c2c88b69e5e7e397ecf8dd313f25596676965d1",
-                    "nonce" : "0xaec21a554b0bd87d",
+                    "gasUsed" : "0xb993",
+                    "hash" : "0xc7c34f5aac1b21ad526d5949305324de32f090bb756f868317611021409139c9",
+                    "mixHash" : "0x40bcc170be2cc2b00de85dfe1eeb587782efda183bc3929630b3f0a129fdc38a",
+                    "nonce" : "0x00e1d2ad1fffaea4",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0xfb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5d",
+                    "stateRoot" : "0x683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b071da05e1dc0f503776529c8c2c88b69e5e7e397ecf8dd313f25596676965d188aec21a554b0bd87df8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0683abcf27f29e2217b8d43c5911bd475bc19076a926a612889d103dab1cee111a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea0fb9c3d93efbcd6022f642567f3eec8f2e89816cc0f7f8fc7fe70dddf8af66a5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9938203e880a040bcc170be2cc2b00de85dfe1eeb587782efda183bc3929630b3f0a129fdc38a8800e1d2ad1fffaea4f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -274,25 +396,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8c2e796f9757d12a47ec5842ba6f946ca64180568f9daf6ba626c86ffdcb099",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc7c34f5aac1b21ad526d5949305324de32f090bb756f868317611021409139c9",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b993",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f466d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +439,10 @@
             }
         }
     },
-    "modexp_d7g0v0_Homestead" : {
+    "modexp_d7g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d7g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x4b829a205c5352a8de8b1d4f030e3d4162f375a13fde1d78239e5e063f75de7e",
-                    "mixHash" : "0x0f954b9648eb077ebcf8ad3b8fd30018e30fd974a2f278b3c01d54e25565dbbd",
-                    "nonce" : "0x299b80247b55e211",
+                    "hash" : "0xb188183324d7d498ead116d69757501dd330557cb27601e6c4419dae078631eb",
+                    "mixHash" : "0x7b08a5f06f0fca207bcc1af3b45ef7f913fefdb7f4ebb98d8a5e79679be5fd0d",
+                    "nonce" : "0x99304e91598cef41",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +465,7 @@
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a00f954b9648eb077ebcf8ad3b8fd30018e30fd974a2f278b3c01d54e25565dbbd88299b80247b55e211f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a07b08a5f06f0fca207bcc1af3b45ef7f913fefdb7f4ebb98d8a5e79679be5fd0d8899304e91598cef41f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -379,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b829a205c5352a8de8b1d4f030e3d4162f375a13fde1d78239e5e063f75de7e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb188183324d7d498ead116d69757501dd330557cb27601e6c4419dae078631eb",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +544,10 @@
             }
         }
     },
-    "modexp_d7g0v0_Metropolis" : {
+    "modexp_d7g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d7g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +558,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xf435",
-                    "hash" : "0x23d3ba8547dd7e39818edf729268823c8c069d5eb312bd927d625c9c2fb45806",
-                    "mixHash" : "0x0573991a9edc92542959107980d805345f277025499a930b5f75e2adcad20058",
-                    "nonce" : "0x069b9512bb628a6e",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x60f96b99a3434099cbcc955a6ac5add0665aefcc972a422fd53cf1a55632f5c1",
+                    "mixHash" : "0xf406816067edf6765266c5d85d6d934ef7fe1a1561f58e011fed659464507c2b",
+                    "nonce" : "0x864226b6da471b34",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x02c7be4cd6abf077f21bcc3f9c283c02010ca68f2e34880a52048fcc909dd0d5",
-                    "stateRoot" : "0x45a87afd9ff37dec359220b229d0f3e62b71c709fd78c9956d8b68d06d754a42",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fde",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a87afd9ff37dec359220b229d0f3e62b71c709fd78c9956d8b68d06d754a42a09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea002c7be4cd6abf077f21bcc3f9c283c02010ca68f2e34880a52048fcc909dd0d5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082f4358203e880a00573991a9edc92542959107980d805345f277025499a930b5f75e2adcad2005888069b9512bb628a6ef8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada09b9221a38a2ad9b49c1dced1274ca9d97ee1eab112c1aea666c32ba51af09fdea08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f406816067edf6765266c5d85d6d934ef7fe1a1561f58e011fed659464507c2b88864226b6da471b34f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000801ba0e608e43687def6bbd46a2e68903e3bacfa7359cbaf5a5d65a6976d895593807ea00a5224ebc6da3afe3dea061f7518cbe137dceec5163f986bcbd1cc28e964b8a3c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",
@@ -484,34 +607,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23d3ba8547dd7e39818edf729268823c8c069d5eb312bd927d625c9c2fb45806",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x60f96b99a3434099cbcc955a6ac5add0665aefcc972a422fd53cf1a55632f5c1",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01",
-                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f435",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f0bcb",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json
index f27a7b710..e3584875d 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d8g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d8g0v0_EIP150" : {
+    "modexp_d8g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d8g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb953",
-                    "hash" : "0xfab3e3df94c6bbca258175be4d0328d2352b4b85a0b0bc8cb92c78c08ee8131b",
-                    "mixHash" : "0xf87c5a4c76b615fb4007f3b166b23472541b2bdfce4c0d86c127e2b8731339b7",
-                    "nonce" : "0xf7ac89253d5833a2",
+                    "gasUsed" : "0xb95d",
+                    "hash" : "0xc13288ce40ab6441947af22fdb8dff36d3e5fd2a3ce95f4ef962e79c3432de65",
+                    "mixHash" : "0x466412928ea559fb1da87e333b4af42fe09530cd8991a8ee14be8a84695d3191",
+                    "nonce" : "0xdc88440481879768",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
-                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
+                    "receiptTrie" : "0xb71a8314f68d915a184815f40842a82535c81706b3fbc287f5788953078a31c8",
+                    "stateRoot" : "0xe165b9142234578bd53dbdad69b179bead51ee5f1e71c0b74fd62bc335f93c89",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a0f87c5a4c76b615fb4007f3b166b23472541b2bdfce4c0d86c127e2b8731339b788f7ac89253d5833a2f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e165b9142234578bd53dbdad69b179bead51ee5f1e71c0b74fd62bc335f93c89a0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba0b71a8314f68d915a184815f40842a82535c81706b3fbc287f5788953078a31c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b95d8203e880a0466412928ea559fb1da87e333b4af42fe09530cd8991a8ee14be8a84695d319188dc88440481879768f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfab3e3df94c6bbca258175be4d0328d2352b4b85a0b0bc8cb92c78c08ee8131b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc13288ce40ab6441947af22fdb8dff36d3e5fd2a3ce95f4ef962e79c3432de65",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b953",
+                "balance" : "0x4563918244f4b95d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f46ad",
+                "balance" : "0x3635c9adc5de9f46a3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,123 @@
             }
         }
     },
-    "modexp_d8g0v0_EIP158" : {
+    "modexp_d8g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d8g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb95d",
+                    "hash" : "0xfa17c9f119eb80255becf4ea78e6122940a20e147ab400c38a66dcd0e7a5fb06",
+                    "mixHash" : "0x6077a153f9f3049aaecd0c105dc9330bb75c4cd72765a55da59c0cd9e945b753",
+                    "nonce" : "0x5261df14c4c87999",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xb71a8314f68d915a184815f40842a82535c81706b3fbc287f5788953078a31c8",
+                    "stateRoot" : "0xe165b9142234578bd53dbdad69b179bead51ee5f1e71c0b74fd62bc335f93c89",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e165b9142234578bd53dbdad69b179bead51ee5f1e71c0b74fd62bc335f93c89a0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba0b71a8314f68d915a184815f40842a82535c81706b3fbc287f5788953078a31c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b95d8203e880a06077a153f9f3049aaecd0c105dc9330bb75c4cd72765a55da59c0cd9e945b753885261df14c4c87999f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645beba",
+                        "s" : "0x49eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12b",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa17c9f119eb80255becf4ea78e6122940a20e147ab400c38a66dcd0e7a5fb06",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b95d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f46a3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d8g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d8g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb953",
-                    "hash" : "0x44ad62092f7e4b590da67623435aa40798bec9c8f021ca9bf7672308e2948a13",
-                    "mixHash" : "0x9ad0a3357707fe6fb8ab3c8adaf0303b47e97d9a3c0ec9988bc816cba682cc9c",
-                    "nonce" : "0x4688e648cc1ccb50",
+                    "hash" : "0x0d8df7e0d542eceee54b7c98d8f0b983d78e2d093499e91f8f2e8633b6c127a7",
+                    "mixHash" : "0x4a8db877b15f76aaea330abfbabdc5e9d03503225c2c9d6b809b696218efc2b5",
+                    "nonce" : "0x8eb37803316ab6fa",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a09ad0a3357707fe6fb8ab3c8adaf0303b47e97d9a3c0ec9988bc816cba682cc9c884688e648cc1ccb50f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a04a8db877b15f76aaea330abfbabdc5e9d03503225c2c9d6b809b696218efc2b5888eb37803316ab6faf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44ad62092f7e4b590da67623435aa40798bec9c8f021ca9bf7672308e2948a13",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0d8df7e0d542eceee54b7c98d8f0b983d78e2d093499e91f8f2e8633b6c127a7",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d8g0v0_Frontier" : {
+    "modexp_d8g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d8g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0x7b7d90b235aff6671a968452c42f0dd0783dbcdb8f07fc7c6c2ce169a3d5b673",
-                    "mixHash" : "0x3eeb13bc79fe04f7502c2dc6553ba5cf549ab16f56bdc64351f4ab5d12dd59ab",
-                    "nonce" : "0xf4425b91c44b9d56",
+                    "gasUsed" : "0xb953",
+                    "hash" : "0xad51ba34192057c01a9a043c25de26a75d8778129504de367cf8fdb4a9535546",
+                    "mixHash" : "0x21209856beb504e6acacaca7ca424c027ef68424db4a1dea2a581b223be07546",
+                    "nonce" : "0x284990420868436b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x54c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374",
+                    "stateRoot" : "0x4e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a03eeb13bc79fe04f7502c2dc6553ba5cf549ab16f56bdc64351f4ab5d12dd59ab88f4425b91c44b9d56f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e7c020febcb701ba1d39872ebfe0a651f94d7caae5e899776815db7d9da3cfea0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba054c816c8844b75471610a5537b82e7345722e976002c32b535e17c5ae573a374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b9538203e880a021209856beb504e6acacaca7ca424c027ef68424db4a1dea2a581b223be0754688284990420868436bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b7d90b235aff6671a968452c42f0dd0783dbcdb8f07fc7c6c2ce169a3d5b673",
-        "network" : "Frontier",
+        "lastblockhash" : "0xad51ba34192057c01a9a043c25de26a75d8778129504de367cf8fdb4a9535546",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b953",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f46ad",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d8g0v0_Homestead" : {
+    "modexp_d8g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d8g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x7704ef8383a40c394fdeb618167ebdf3ef8cb6ecbd923b45616382af25811968",
-                    "mixHash" : "0xf09388c81a4e31cbe91af7944ef73bddcb518570faff2282a399f243b9d1d8ae",
-                    "nonce" : "0xa3c23e466a591de3",
+                    "hash" : "0x913f35338631357fd65c4d934eccba36ae69fecd360ee3f0c32bc3caf1a26424",
+                    "mixHash" : "0x76e7558657673d6579e23b58b72f5fead1fa97851d76d2d9c17ba0802666d26e",
+                    "nonce" : "0xb8f8d78341361343",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f09388c81a4e31cbe91af7944ef73bddcb518570faff2282a399f243b9d1d8ae88a3c23e466a591de3f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a076e7558657673d6579e23b58b72f5fead1fa97851d76d2d9c17ba0802666d26e88b8f8d78341361343f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7704ef8383a40c394fdeb618167ebdf3ef8cb6ecbd923b45616382af25811968",
-        "network" : "Homestead",
+        "lastblockhash" : "0x913f35338631357fd65c4d934eccba36ae69fecd360ee3f0c32bc3caf1a26424",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d8g0v0_Metropolis" : {
+    "modexp_d8g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d8g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb95d",
-                    "hash" : "0x5937409b8da2fbb833d4af0e6d629b0d3f3f244d491f3da2a9524748c789f650",
-                    "mixHash" : "0x88aea543dce0bc832725da4162abe1a08c88eda4540a29bfc0fad5286abf7073",
-                    "nonce" : "0x8ee7dcda2ad6e34f",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x272bfb6c13a20367d988eb45ff916c0be4503d4fef1be4c03838fd355e5ee3e8",
+                    "mixHash" : "0xcf124389fd851cda66496692bbe92440ef1b4dd6297ffd0dac8b40d245f82fab",
+                    "nonce" : "0x5141229f8097e80b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xb71a8314f68d915a184815f40842a82535c81706b3fbc287f5788953078a31c8",
-                    "stateRoot" : "0xe165b9142234578bd53dbdad69b179bead51ee5f1e71c0b74fd62bc335f93c89",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c6f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e165b9142234578bd53dbdad69b179bead51ee5f1e71c0b74fd62bc335f93c89a0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba0b71a8314f68d915a184815f40842a82535c81706b3fbc287f5788953078a31c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b95d8203e880a088aea543dce0bc832725da4162abe1a08c88eda4540a29bfc0fad5286abf7073888ee7dcda2ad6e34ff8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
+                "rlp" : "0xf902c8f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada0c57cdeffa8a4f5ef61e7a9a21221dd8f3b59474e8125d8df6726ef05c9c7147ba08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0cf124389fd851cda66496692bbe92440ef1b4dd6297ffd0dac8b40d245f82fab885141229f8097e80bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000001ca0ecdf7d03f7d80b6ceb558b9c88155c22656bf3db6f4908ba4a859bb1b645bebaa049eccd28a8a1557a8478b2e70cda04ac4aedd32de0963557201772a1fba0a12bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5937409b8da2fbb833d4af0e6d629b0d3f3f244d491f3da2a9524748c789f650",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x272bfb6c13a20367d988eb45ff916c0be4503d4fef1be4c03838fd355e5ee3e8",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b95d",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f46a3",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json
index a15d42338..d70f965e6 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d9g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d9g0v0_EIP150" : {
+    "modexp_d9g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d9g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0x700d7cc2cb25502d924227d081485a2c4d8d628203df8e38edef6bb348746b02",
-                    "mixHash" : "0xf6f1ac9e730e26b15de8d23dd24e5df4fb0d1464d6bfd743f5a4cff63d73726b",
-                    "nonce" : "0x11043b61f1d27a40",
+                    "hash" : "0x0e0a082b783d00452acd89207e1e3e30622b924bbc43927c987e84b400c38dbe",
+                    "mixHash" : "0x16513dacb320cfea93bda5fec5fa4f9315bde1d8a2352f92e58c0a990c8ea7d2",
+                    "nonce" : "0xb4129ffd5298f59f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
-                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0f6f1ac9e730e26b15de8d23dd24e5df4fb0d1464d6bfd743f5a4cff63d73726b8811043b61f1d27a40f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a016513dacb320cfea93bda5fec5fa4f9315bde1d8a2352f92e58c0a990c8ea7d288b4129ffd5298f59ff8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x700d7cc2cb25502d924227d081485a2c4d8d628203df8e38edef6bb348746b02",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0e0a082b783d00452acd89207e1e3e30622b924bbc43927c987e84b400c38dbe",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d9g0v0_EIP158" : {
+    "modexp_d9g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d9g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb98f",
-                    "hash" : "0xb46ed4b26b93760baae20e7a4e3081868d868840dc0c32ad8260c6b1b133de2c",
-                    "mixHash" : "0x63f788d1e573cd1ea0d4b53c621535617099b47a80f604cb1a29b51bcc8bb3ae",
-                    "nonce" : "0x9f9fa9b75ee7eaf5",
+                    "hash" : "0x4b5805da41fcea1cf23af634792dfbd1b8b9205107f6327b9b6ff528bf04e466",
+                    "mixHash" : "0x84490a5182550f289dfef99bedb719479e73a411ed4d387a3268f25e67db47c0",
+                    "nonce" : "0x91ffa857650b9583",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
+                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a084490a5182550f289dfef99bedb719479e73a411ed4d387a3268f25e67db47c08891ffa857650b9583f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6e",
+                        "s" : "0x32ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b5805da41fcea1cf23af634792dfbd1b8b9205107f6327b9b6ff528bf04e466",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b98f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f4671",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d9g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d9g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0x0b8e98f45826fb31ab640f3267b9fec656ecd02d3c1acdea0ffac170d80d6827",
+                    "mixHash" : "0x82c1b127e7ed69c84f19c7f61a5eaafc3fc32150f0899dc8b32a10f510de4f5d",
+                    "nonce" : "0x762321acdfb18a98",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a063f788d1e573cd1ea0d4b53c621535617099b47a80f604cb1a29b51bcc8bb3ae889f9fa9b75ee7eaf5f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a082c1b127e7ed69c84f19c7f61a5eaafc3fc32150f0899dc8b32a10f510de4f5d88762321acdfb18a98f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb46ed4b26b93760baae20e7a4e3081868d868840dc0c32ad8260c6b1b133de2c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0b8e98f45826fb31ab640f3267b9fec656ecd02d3c1acdea0ffac170d80d6827",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d9g0v0_Frontier" : {
+    "modexp_d9g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d9g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xb46854b92f8f109cf3a85e8c2c04112bd433e31f3f4829cc2abd650a7db23c89",
-                    "mixHash" : "0x5fda4b9b555f3744b23db4404ac484b144e90c4b8ece9a22df1b062b51511c56",
-                    "nonce" : "0x852d6fe874fc6ce3",
+                    "gasUsed" : "0xb98f",
+                    "hash" : "0xf67e61fb4c179a029b008a8c4fc64ea51860ae5d32966325f8cb9c21e6fcf5df",
+                    "mixHash" : "0xd2c385d1e9f245e4775e92373b3980ac6e637a5ecbdde5f4e1ff7560be49a0a8",
+                    "nonce" : "0x4419eef8a9459ff2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x7fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bdda",
+                    "stateRoot" : "0x7dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a05fda4b9b555f3744b23db4404ac484b144e90c4b8ece9a22df1b062b51511c5688852d6fe874fc6ce3f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dfc0ada51723b091e36015148efda8c903c62236d59dbce85c3d354e4afa4fea015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a07fed19b8d0192839f55e49fc1c0fdfd6010257eb90391ad9dcdf1fd387e6bddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a0d2c385d1e9f245e4775e92373b3980ac6e637a5ecbdde5f4e1ff7560be49a0a8884419eef8a9459ff2f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb46854b92f8f109cf3a85e8c2c04112bd433e31f3f4829cc2abd650a7db23c89",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf67e61fb4c179a029b008a8c4fc64ea51860ae5d32966325f8cb9c21e6fcf5df",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b98f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f4671",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d9g0v0_Homestead" : {
+    "modexp_d9g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d9g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd71ccd1a6f0851ec471dea69aaef5ecab4b9fc49eddded876fc4f61855166100",
-                    "mixHash" : "0x384f6f52a8f2a3ceedb3cff25c58757410cfef8f9872469223e83e216eb7ddd3",
-                    "nonce" : "0x95ae696d23ee1d94",
+                    "hash" : "0x1fc79a3bfed771a38ca44684f9ba9a9b91df247b38966b5ecaada7dad4151a5f",
+                    "mixHash" : "0x1ba096f3f5e58a7d90c73f9f25974cd33309f35c08af8bbdb1e267787f32d255",
+                    "nonce" : "0xcfffd278cc656b20",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0384f6f52a8f2a3ceedb3cff25c58757410cfef8f9872469223e83e216eb7ddd38895ae696d23ee1d94f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a01ba096f3f5e58a7d90c73f9f25974cd33309f35c08af8bbdb1e267787f32d25588cfffd278cc656b20f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd71ccd1a6f0851ec471dea69aaef5ecab4b9fc49eddded876fc4f61855166100",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1fc79a3bfed771a38ca44684f9ba9a9b91df247b38966b5ecaada7dad4151a5f",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d9g0v0_Metropolis" : {
+    "modexp_d9g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d9g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb98f",
-                    "hash" : "0x399699a2279113cd39402623ea99fef765a30ef82767be287851e0d7ce020750",
-                    "mixHash" : "0x5be73edc12b403bac3b4f3e00f2184cca9c71a7ad15f403e3df90e8770932f90",
-                    "nonce" : "0x7dc40b972e09fe1d",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x20b1cf24c3f1c510b6b54395fe153d5ede0dc18eb33b89dfc2acf9c75f00c8ee",
+                    "mixHash" : "0x9232acf88231a0bd58c64e1c2b317059cbdaef845b65ca65140ac2974f9e752c",
+                    "nonce" : "0x3b4b88ca4872b023",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0xc403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4",
-                    "stateRoot" : "0x55d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bf",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055d1a2e3c5821e1558588b0af620e03e634732e4cf134e5d631bfb8f920500bfa015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0c403405c79ef35012968e16f7e7d37773bb20da211197dd24ec0004a5afaccd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b98f8203e880a05be73edc12b403bac3b4f3e00f2184cca9c71a7ad15f403e3df90e8770932f90887dc40b972e09fe1df8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c7f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a09232acf88231a0bd58c64e1c2b317059cbdaef845b65ca65140ac2974f9e752c883b4b88ca4872b023f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x399699a2279113cd39402623ea99fef765a30ef82767be287851e0d7ce020750",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x20b1cf24c3f1c510b6b54395fe153d5ede0dc18eb33b89dfc2acf9c75f00c8ee",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b98f",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f4671",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json
index d69c57145..f0856ef94 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/sec80_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "sec80_d0g0v0_EIP150" : {
+    "sec80_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/stPreCompiledContracts/sec80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xaf2d",
-                    "hash" : "0x9d133efc9f04b9af4e460c1a334990c286d51628b9c5e91df2b3198ba6843c6a",
-                    "mixHash" : "0x71ab8ea1dffddd84ea591317605f1868fb5263abdd10b1add4b4b86caba59233",
-                    "nonce" : "0x5b6faf633270417c",
+                    "hash" : "0xeb9e9836cd4b02a8788149eb7567057ff47a1aa82a9ee0b3daef7ce07cb0893e",
+                    "mixHash" : "0xd81cdfd5e647adbaffc8af2c8204df42153e9a1318656c68d9601621cec9f1c6",
+                    "nonce" : "0xa8bca199e0cc90ed",
                     "number" : "0x01",
                     "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
-                    "receiptTrie" : "0x46f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4c",
-                    "stateRoot" : "0x48570c0e86f5bec15ac3a6453d0acd2736e0eecd350bf5e19e24bf616875993c",
+                    "receiptTrie" : "0xcb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517",
+                    "stateRoot" : "0x476787722b03dcc6f223683f361bf69cf5a4ece6711e7e71b297172b495b2efc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048570c0e86f5bec15ac3a6453d0acd2736e0eecd350bf5e19e24bf616875993ca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a046f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a071ab8ea1dffddd84ea591317605f1868fb5263abdd10b1add4b4b86caba59233885b6faf633270417cf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0476787722b03dcc6f223683f361bf69cf5a4ece6711e7e71b297172b495b2efca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a0d81cdfd5e647adbaffc8af2c8204df42153e9a1318656c68d9601621cec9f1c688a8bca199e0cc90edf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d133efc9f04b9af4e460c1a334990c286d51628b9c5e91df2b3198ba6843c6a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeb9e9836cd4b02a8788149eb7567057ff47a1aa82a9ee0b3daef7ce07cb0893e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "sec80_d0g0v0_EIP158" : {
+    "sec80_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/stPreCompiledContracts/sec80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xaf2d",
-                    "hash" : "0xd9bbd4993594249c2c3824d49f49782552bbbf8bca68f95ec8b52b4450d04274",
-                    "mixHash" : "0x85f9faa88949043ecd3901a1241e9a65714c6d966a5c3b2697f7233000aa9755",
-                    "nonce" : "0x03cf4ce4efcf7243",
+                    "hash" : "0xd00221b6cfefe6e8f056472ec0fa526ff9a950c999796f39e462233d80d6c178",
+                    "mixHash" : "0xa6b3ab4c0cab8b40f3924701d956a81a88fc29496591102bd43e3f529e739ef3",
+                    "nonce" : "0xa21a6f9b95d7fdec",
+                    "number" : "0x01",
+                    "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
+                    "receiptTrie" : "0xcb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517",
+                    "stateRoot" : "0x476787722b03dcc6f223683f361bf69cf5a4ece6711e7e71b297172b495b2efc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0476787722b03dcc6f223683f361bf69cf5a4ece6711e7e71b297172b495b2efca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a0a6b3ab4c0cab8b40f3924701d956a81a88fc29496591102bd43e3f529e739ef388a21a6f9b95d7fdecf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x25a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd00221b6cfefe6e8f056472ec0fa526ff9a950c999796f39e462233d80d6c178",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xc001f00d"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4af2d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761ca33",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "sec80_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/sec80_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xaf2d",
+                    "hash" : "0x5a9c93f0f4c26d6d7fd1b5387af896c2c5bdc5be1695a0ae54541688de36cc7c",
+                    "mixHash" : "0xde642b4ef7cdb0e6772903c4f7b338560fb116259f80bfcf7153ad9b29169c2b",
+                    "nonce" : "0xa88a4a7572d31cd3",
                     "number" : "0x01",
                     "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
                     "receiptTrie" : "0x46f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4c",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048570c0e86f5bec15ac3a6453d0acd2736e0eecd350bf5e19e24bf616875993ca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a046f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a085f9faa88949043ecd3901a1241e9a65714c6d966a5c3b2697f7233000aa97558803cf4ce4efcf7243f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048570c0e86f5bec15ac3a6453d0acd2736e0eecd350bf5e19e24bf616875993ca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a046f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a0de642b4ef7cdb0e6772903c4f7b338560fb116259f80bfcf7153ad9b29169c2b88a88a4a7572d31cd3f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9bbd4993594249c2c3824d49f49782552bbbf8bca68f95ec8b52b4450d04274",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5a9c93f0f4c26d6d7fd1b5387af896c2c5bdc5be1695a0ae54541688de36cc7c",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "sec80_d0g0v0_Frontier" : {
+    "sec80_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/stPreCompiledContracts/sec80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xac99",
-                    "hash" : "0x0551c2e6f92b8b65f584114aa834dacd2c5e9bfffd5fc1aeb5e1c5c440883e9b",
-                    "mixHash" : "0x8608212b740607e25ca7be4f7999c7d6c52e316e9a9b73e54e5c013ecea622ec",
-                    "nonce" : "0xf4305ca31c44eb30",
+                    "gasUsed" : "0xaf2d",
+                    "hash" : "0xb14d3d6a7dbdc06f3dedfcff093ed4433136b583cad1b40738a3a0e19b51334a",
+                    "mixHash" : "0x1572af102f601c4dc4d340987c2e93339c1402ef6fb7e1e7a83ee90ac338c056",
+                    "nonce" : "0x55af85037473dfde",
                     "number" : "0x01",
                     "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
-                    "receiptTrie" : "0xc3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594",
-                    "stateRoot" : "0x63d62d88e6f9f7340dda62f6a7c81caf6e7e7212edb0df45b622399da6c9178f",
+                    "receiptTrie" : "0x46f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4c",
+                    "stateRoot" : "0x48570c0e86f5bec15ac3a6453d0acd2736e0eecd350bf5e19e24bf616875993c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d62d88e6f9f7340dda62f6a7c81caf6e7e7212edb0df45b622399da6c9178fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0c3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ac998203e880a08608212b740607e25ca7be4f7999c7d6c52e316e9a9b73e54e5c013ecea622ec88f4305ca31c44eb30f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048570c0e86f5bec15ac3a6453d0acd2736e0eecd350bf5e19e24bf616875993ca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a046f10f0f8ccd6ac607124cf3409bfb6b15029c132e210438999f7fd81171bb4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a01572af102f601c4dc4d340987c2e93339c1402ef6fb7e1e7a83ee90ac338c0568855af85037473dfdef865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0551c2e6f92b8b65f584114aa834dacd2c5e9bfffd5fc1aeb5e1c5c440883e9b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb14d3d6a7dbdc06f3dedfcff093ed4433136b583cad1b40738a3a0e19b51334a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ac99",
+                "balance" : "0x4563918244f4af2d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ccc7",
+                "balance" : "0x0de0b6b3a761ca33",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "sec80_d0g0v0_Homestead" : {
+    "sec80_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/stPreCompiledContracts/sec80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xac99",
-                    "hash" : "0x1e2e5b0f983d68ce9c8cf67c2e482c8016cbbc09d5c89d4e4dfb4d39f521870c",
-                    "mixHash" : "0xf243e63bb34bd67c212b41d131337ac6095d13b8040e574862f064719fcb35c0",
-                    "nonce" : "0xc96917881febe9b8",
+                    "hash" : "0xe49e04487623e87868ca58491c9faf1c9098c1afb2f09402fdb8aa463c9b0c0c",
+                    "mixHash" : "0x265bb7afd94a1f4829fbeb258e62608469989ac76590705a7cc092b1bb5efb94",
+                    "nonce" : "0x161871b6514398ff",
                     "number" : "0x01",
                     "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
                     "receiptTrie" : "0xc3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d62d88e6f9f7340dda62f6a7c81caf6e7e7212edb0df45b622399da6c9178fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0c3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ac998203e880a0f243e63bb34bd67c212b41d131337ac6095d13b8040e574862f064719fcb35c088c96917881febe9b8f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d62d88e6f9f7340dda62f6a7c81caf6e7e7212edb0df45b622399da6c9178fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0c3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ac998203e880a0265bb7afd94a1f4829fbeb258e62608469989ac76590705a7cc092b1bb5efb9488161871b6514398fff865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e2e5b0f983d68ce9c8cf67c2e482c8016cbbc09d5c89d4e4dfb4d39f521870c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe49e04487623e87868ca58491c9faf1c9098c1afb2f09402fdb8aa463c9b0c0c",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "sec80_d0g0v0_Metropolis" : {
+    "sec80_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/stPreCompiledContracts/sec80_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xaf2d",
-                    "hash" : "0x95947b084f78c74afd318934e4c1edcf7c021125f6ff560047f549a57381a396",
-                    "mixHash" : "0xf7621bd2082939cdcf0863196856a157e5ef04dad256242566e8f108031bf93d",
-                    "nonce" : "0x15a63fdac9971a29",
+                    "gasUsed" : "0xac99",
+                    "hash" : "0x6afbcad9de8a78000f2ba7deac7f15f28358a742f0efe6340f090ad224b08b0d",
+                    "mixHash" : "0x5561a74827d228d546e540f6c90e6fe84b7899f1bf4e66f141adeefddac371d1",
+                    "nonce" : "0xb090afa50d744236",
                     "number" : "0x01",
                     "parentHash" : "0x685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abf",
-                    "receiptTrie" : "0xcb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517",
-                    "stateRoot" : "0x476787722b03dcc6f223683f361bf69cf5a4ece6711e7e71b297172b495b2efc",
+                    "receiptTrie" : "0xc3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594",
+                    "stateRoot" : "0x63d62d88e6f9f7340dda62f6a7c81caf6e7e7212edb0df45b622399da6c9178f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0476787722b03dcc6f223683f361bf69cf5a4ece6711e7e71b297172b495b2efca0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0cb01b5c5f4202602d4329ead8fb66227f8dfefd2d75b05ee01e76b6118d43517b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082af2d8203e880a0f7621bd2082939cdcf0863196856a157e5ef04dad256242566e8f108031bf93d8815a63fdac9971a29f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90262f901f7a0685e58a31539f57e51f4ae36f8e1559aa3d9f52b8a0dcdf5d545066111701abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d62d88e6f9f7340dda62f6a7c81caf6e7e7212edb0df45b622399da6c9178fa0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0c3b37600736562a81dcb791a832b14322f11c72bb5ef8aef4d6e5fb0b3441594b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ac998203e880a05561a74827d228d546e540f6c90e6fe84b7899f1bf4e66f141adeefddac371d188b090afa50d744236f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025a4db33e2f4a0ef769302c3d94763756cd510430bdb2419ca098625180e2846a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95947b084f78c74afd318934e4c1edcf7c021125f6ff560047f549a57381a396",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6afbcad9de8a78000f2ba7deac7f15f28358a742f0efe6340f090ad224b08b0d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4af2d",
+                "balance" : "0x4563918244f4ac99",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ca33",
+                "balance" : "0x0de0b6b3a761ccc7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {